add missing script - 2.8 (#12678)

* add missing script * fix parse-tag-name to allow for release of both catalog and charts for extensions * add mising type definitions
rancher · Nov 26, 2024 · 03b3317 · 03b3317
1 parent aeb48e5
commit 03b3317
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 14 deletions.
diff --git a/.github/workflows/scripts/retrieve-versions.sh b/.github/workflows/scripts/retrieve-versions.sh
@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+set -eo pipefail
+
+SCRIPT_DIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)"
+BASE_DIR="$(
+  cd $SCRIPT_DIR && cd ../.. &
+  pwd
+)"
+SHELL_DIR=$BASE_DIR/shell
+CREATORS_DIR=$BASE_DIR/creators/extension
+
+function generate_tag_export() {
+  NAME=$1
+
+  case $NAME in
+    "shell")
+      SHELL_V=$(jq -r .version ${SHELL_DIR}/package.json)
+      echo "SHELL_TAG=shell-pkg-v$SHELL_V" >> $GITHUB_OUTPUT
+      echo "Shell tag retrieved ::: ${SHELL_V}"
+      ;;
+    "creators")
+      CREATORS_V=$(jq -r .version ${CREATORS_DIR}/package.json)
+      echo "CREATORS_TAG=creators-pkg-v$CREATORS_V" >> $GITHUB_OUTPUT
+      echo "Creators tag retrieved ::: ${CREATORS_V}"
+      ;;
+    "extension")
+      REPO_NAME=$2
+      BRANCH=$3
+      EXTENSION=$4
+      git clone https://github.com/rancher/$REPO_NAME.git
+      pushd ${BASE_DIR}/$REPO_NAME
+
+      git checkout $BRANCH
+
+      ECI_NAME=$(jq -r .name ./package.json)
+      ECI_VERSION=$(jq -r .version ./package.json)
+      EXTENSION_VERSION=$(jq -r .version pkg/$EXTENSION/package.json)
+      ECI_TAG_FULL=$ECI_NAME-$ECI_VERSION
+      EXTENSION_TAG_FULL=$EXTENSION-$EXTENSION_VERSION
+
+      echo "ECI_TAG=$ECI_TAG_FULL" >> $GITHUB_OUTPUT
+      echo "EXTENSION_TAG=$EXTENSION_TAG_FULL" >> $GITHUB_OUTPUT
+      echo "ECI tag retrieved ::: ${ECI_TAG_FULL}"
+      echo "Extension tag retrieved ::: ${EXTENSION_TAG_FULL}"
+
+      popd
+      ;;
+  esac
+}
+
+generate_tag_export "shell"
+generate_tag_export "creators"
+generate_tag_export "extension" "ui-plugin-examples" "main" "clock"
diff --git a/shell/scripts/extension/parse-tag-name b/shell/scripts/extension/parse-tag-name
@@ -6,27 +6,32 @@ GITHUB_WORKFLOW_TYPE=$3
 
 echo "Parse tag name - evaluating release tag $GITHUB_RELEASE_TAG"
 
-# Check packages for released tag name
-if [[ "${GITHUB_WORKFLOW_TYPE}" == "container" ]]; then
+# Ensure "catalog" workflow release tag name matches the root <pkg-name>
+if [[ "${GITHUB_WORKFLOW_TYPE}" == "catalog" ]]; then
+  BASE_EXT=$(jq -r .name package.json)
+  EXT_VERSION=$(jq -r .version package.json)
+
+  if [[ "${GITHUB_RELEASE_TAG}" != "${BASE_EXT}-${EXT_VERSION}" ]]; then
+    echo -e "release tag doesn't match catalog tag: release tag -> ${GITHUB_RELEASE_TAG} ::: curr catalog tag -> ${BASE_EXT}-${EXT_VERSION}"
+    gh run cancel ${GITHUB_RUN_ID}
+  fi
+# Ensure "chart" workflow release tag name matches some pkg/<pkg-name>
+else
+  NO_MATCHES="true"
+
   for d in pkg/*/ ; do
     pkg=$(basename $d)
 
     PKG_VERSION=$(jq -r .version pkg/${pkg}/package.json)
-    PKG_NAME="${pkg}-${PKG_VERSION}"
+    CURR_PKG_TAG="${pkg}-${PKG_VERSION}"
 
-    if [[ "${GITHUB_RELEASE_TAG}" == "${PKG_NAME}" ]]; then
-      gh run cancel ${GITHUB_RUN_ID}
-    else
-      continue
+    if [[ "${GITHUB_RELEASE_TAG}" == "${CURR_PKG_TAG}" ]]; then
+      NO_MATCHES="false"
     fi
   done
-else
-  # Check base extension name for tag name
-  BASE_EXT=$(jq -r .name package.json)
-  EXT_VERSION=$(jq -r .version package.json)
 
-  if [[ "${GITHUB_RELEASE_TAG}" == "${BASE_EXT}-${EXT_VERSION}" ]]; then
-    echo -e "tag: ${GITHUB_RELEASE_TAG}"
+  if [[ "${NO_MATCHES}" == "true" ]]; then
+    echo -e "release tag doesn't match any chart tag: ${GITHUB_RELEASE_TAG}. Check your pkg/<!-YOUR-EXT-> folders and corresponding versions to complete the match"
     gh run cancel ${GITHUB_RUN_ID}
   fi
 fi
diff --git a/shell/scripts/typegen.sh b/shell/scripts/typegen.sh
@@ -31,9 +31,11 @@ ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/normalize
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/resource-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/classify.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/dashboard-store/actions.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/dashboard-store/ > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/plugins/steve/steve-class.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/plugins/steve/ > /dev/null
 
 # # mixins
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/create-edit-view/index.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins/create-edit-view > /dev/null
+${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/mixins/resource-fetch.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/mixins > /dev/null
 
 # # models
 ${BASE_DIR}/node_modules/.bin/tsc ${SHELL_DIR}/models/namespace.js --declaration --allowJs --emitDeclarationOnly --outDir ${SHELL_DIR}/tmp/models/ > /dev/null
@@ -93,4 +95,4 @@ function processDir() {
 
 processDir ${SHELL_DIR}/tmp @shell
 
-rm -rf ${SHELL_DIR}/tmp
+rm -rf ${SHELL_DIR}/tmp