diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml index 7468cb3bbc..c2b9cafb22 100644 --- a/.github/workflows/osd-increment-plugin-versions.yml +++ b/.github/workflows/osd-increment-plugin-versions.yml @@ -27,7 +27,7 @@ jobs: - {repo: OpenSearch-Dashboards} - {repo: dashboards-observability} - {repo: dashboards-reporting} - - {repo: dashboards-visualizations, path: gantt-chart} + - {repo: dashboards-visualizations} - {repo: dashboards-query-workbench} - {repo: dashboards-assistant} - {repo: dashboards-maps} diff --git a/manifests/2.12.0/opensearch-dashboards-2.12.0.yml b/manifests/2.12.0/opensearch-dashboards-2.12.0.yml index a3a27ae943..7333ff82bc 100644 --- a/manifests/2.12.0/opensearch-dashboards-2.12.0.yml +++ b/manifests/2.12.0/opensearch-dashboards-2.12.0.yml @@ -21,7 +21,6 @@ components: ref: 2.x - name: ganttChartDashboards repository: https://github.com/opensearch-project/dashboards-visualizations.git - working_directory: gantt-chart ref: 2.x - name: queryWorkbenchDashboards repository: https://github.com/opensearch-project/dashboards-query-workbench.git diff --git a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml index c340c120cb..ad37725764 100644 --- a/manifests/3.0.0/opensearch-dashboards-3.0.0.yml +++ b/manifests/3.0.0/opensearch-dashboards-3.0.0.yml @@ -30,7 +30,6 @@ components: ref: main - name: ganttChartDashboards repository: https://github.com/opensearch-project/dashboards-visualizations.git - working_directory: gantt-chart ref: main - name: assistantDashboards repository: https://github.com/opensearch-project/dashboards-assistant.git diff --git a/scripts/components/ganttChartDashboards/build.sh b/scripts/components/ganttChartDashboards/build.sh deleted file mode 100755 index 435ae4dc3f..0000000000 --- a/scripts/components/ganttChartDashboards/build.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/bash - -# Copyright OpenSearch Contributors -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. - -set -ex - -# vars / libs -SCRIPT_DIR=`dirname $(realpath $0)` -. $SCRIPT_DIR/../../../lib/shell/file_management.sh -# For hybrid plugin it actually resides in 'dashboards-visualizations/gantt-chart' -PLUGIN_FOLDER=$(basename "$PWD") -PLUGIN_NAME=$(basename $(dirname "$PWD")) -PLUGIN_PATH=`realpath ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER` - -function usage() { - echo "Usage: $0 [args]" - echo "" - echo "Arguments:" - echo -e "-v VERSION\t[Required] OpenSearch version." - echo -e "-q QUALIFIER\t[Optional] Version qualifier." - echo -e "-s SNAPSHOT\t[Optional] Build a snapshot, default is 'false'." - echo -e "-p PLATFORM\t[Optional] Platform, ignored." - echo -e "-a ARCHITECTURE\t[Optional] Build architecture, ignored." - echo -e "-o OUTPUT\t[Optional] Output path, default is 'artifacts'." - echo -e "-h help" -} - -function cleanup_all() { - File_Delete $PLUGIN_PATH -} - -trap cleanup_all TERM INT EXIT - -while getopts ":h:v:q:s:o:p:a:" arg; do - case $arg in - h) - usage - exit 1 - ;; - v) - VERSION=$OPTARG - ;; - q) - QUALIFIER=$OPTARG - ;; - s) - SNAPSHOT=$OPTARG - ;; - o) - OUTPUT=$OPTARG - ;; - p) - PLATFORM=$OPTARG - ;; - a) - ARCHITECTURE=$OPTARG - ;; - :) - echo "Error: -${OPTARG} requires an argument" - usage - exit 1 - ;; - ?) - echo "Invalid option: -${arg}" - exit 1 - ;; - esac -done - -if [ -z "$VERSION" ]; then - echo "Error: You must specify the OpenSearch Dashboards version" - usage - exit 1 -fi - -[ -z "$OUTPUT" ] && OUTPUT=artifacts -[ ! -z "$QUALIFIER" ] && QUALIFIER_IDENTIFIER="-$QUALIFIER" - -NVM_CMD="source $NVM_DIR/nvm.sh && nvm use" -if [ "$PLATFORM" = "windows" ]; then - NVM_CMD="volta install node@`cat ../../OpenSearch-Dashboards/.nvmrc` && volta install yarn@`jq -r '.engines.yarn' ../../OpenSearch-Dashboards/package.json`" -fi - -mkdir -p $OUTPUT/plugins -# TODO: [CLEANUP] Needed OpenSearch Dashboards git repo to build the required modules for plugins -# This makes it so there is a dependency on having Dashboards pulled already. -cp -r ../$PLUGIN_FOLDER/ ../../OpenSearch-Dashboards/plugins -echo "BUILD MODULES FOR $PLUGIN_NAME" -CURR_DIR=`pwd` -cd ../../OpenSearch-Dashboards; eval $NVM_CMD; yarn osd bootstrap -echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME" -cd plugins/$PLUGIN_FOLDER; yarn plugin-helpers build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER -cd $CURR_DIR -echo "COPY $PLUGIN_NAME.zip" -cp -r ../../OpenSearch-Dashboards/plugins/$PLUGIN_FOLDER/build/$PLUGIN_NAME-$VERSION$QUALIFIER_IDENTIFIER.zip $OUTPUT/plugins/