@rancher/shell 0.5.3 → 2.0.0

package/rancher-components/components/LabeledTooltip/LabeledTooltip.vue

@@ -1,7 +1,7 @@
 <script lang="ts">
-import Vue from 'vue';
+import { defineComponent } from 'vue';
 
-export default Vue.extend({
+export default defineComponent({
   props: {
     /**
      * The Labeled Tooltip value.
@@ -29,9 +29,14 @@ export default Vue.extend({
     }
   },
   computed: {
-    iconClass() {
+    iconClass(): string {
       return this.status === 'error' ? 'icon-warning' : 'icon-info';
     }
+  },
+  methods: {
+    isObject(value: string | Record<string, unknown>): value is Record<string, unknown> {
+      return typeof value === 'object' && value !== null && !!value.content;
+    }
   }
 });
 </script>
@@ -44,7 +49,7 @@ export default Vue.extend({
   >
     <template v-if="hover">
       <i
-        v-clean-tooltip="value.content ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value"
+        v-clean-tooltip="isObject(value) ? { ...{content: value.content, classes: [`tooltip-${status}`]}, ...value } : value"
         :class="{'hover':!value, [iconClass]: true}"
         class="icon status-icon"
       />

package/rancher-components/components/StringList/StringList.vue

@@ -1,5 +1,5 @@
 <script lang="ts">
-import Vue, { PropType } from 'vue';
+import Vue, { PropType, defineComponent } from 'vue';
 
 import LabeledInput from '@components/Form/LabeledInput/LabeledInput.vue';
 import { findStringIndex, hasDuplicatedStrings } from '@shell/utils/array';
@@ -29,7 +29,7 @@ const CLASS = {
 /**
  * Manage a list of strings
  */
-export default Vue.extend({
+export default defineComponent({
 
   name:       'StringList',
   components: { LabeledInput },
@@ -92,9 +92,9 @@ export default Vue.extend({
   },
   data() {
     return {
-      value:        null as string | null,
+      value:        undefined as string | undefined,
       selected:     null as string | null,
-      editedItem:   null as string | null,
+      editedItem:   undefined as string | undefined,
       isCreateItem: false,
       errors:       { duplicate: false } as Record<Error, boolean>
     };
@@ -281,7 +281,7 @@ export default Vue.extend({
         this.isCreateItem = true;
         this.setFocus(INPUT.create);
       } else {
-        this.value = null;
+        this.value = undefined;
         this.toggleError('duplicate', false);
         this.onSelectLeave();
 
@@ -303,11 +303,11 @@ export default Vue.extend({
         this.editedItem = item || '';
         this.setFocus(INPUT.edit);
       } else {
-        this.value = null;
+        this.value = undefined;
         this.toggleError('duplicate', false);
         this.onSelectLeave();
 
-        this.editedItem = null;
+        this.editedItem = undefined;
       }
     },
 
@@ -502,7 +502,7 @@ export default Vue.extend({
         <button
           data-testid="button-add"
           class="btn btn-sm role-tertiary add-button"
-          :disabled="isCreateItem || editedItem"
+          :disabled="!!isCreateItem || !!editedItem"
           @click.prevent="onClickPlusButton"
         >
           <span class="icon icon-plus icon-sm" />

package/scripts/.gitlab/workflows/build-extension-catalog.gitlab-ci.yml

@@ -1,8 +1,27 @@
+variables:
+  NODE_VERSION: "v16.20.2"
+  NODE_DISTRO: "node-${NODE_VERSION}-linux-x64"
+  YQ_VERSION: "v4.44.1"
+  YQ_URL: "https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/yq_linux_amd64"
+
 .podman-setup: &podman-setup
+  # Install podman and jq
   - zypper --non-interactive install jq podman
   - usermod --add-subuids 100000-165535 --add-subgids 100000-165535 $(id -nu)
   - podman login -u $REGISTRY_USER -p $REGISTRY_PASSWORD $REGISTRY
 
+.node-setup: &node-setup
+  # Download, verify, and install Node.js, npm, and yarn
+  - curl -O https://nodejs.org/download/release/${NODE_VERSION}/${NODE_DISTRO}.tar.gz
+  - curl -O https://nodejs.org/download/release/${NODE_VERSION}/SHASUMS256.txt
+  - grep "${NODE_DISTRO}.tar.gz" SHASUMS256.txt | sha256sum -c -
+  - tar -xzf ${NODE_DISTRO}.tar.gz
+  - mv ${NODE_DISTRO} /usr/local/node
+  - ln -s /usr/local/node/bin/node /usr/local/bin/node
+  - ln -s /usr/local/node/bin/npm /usr/local/bin/npm
+  - npm install -g --unsafe-perm yarn
+  - export PATH="/usr/local/node/bin:/root/.npm-global/bin:$PATH"
+
 check_version_collisions:
   stage: check_version
   rules:
@@ -26,8 +45,6 @@ check_version_collisions:
       done
 
       echo -e "Published image not found for version ${PACKAGE_VERSION}, continuing build..."
-  tags:
-    - linux
 
 build_and_release:
   stage: build_catalog
@@ -36,15 +53,17 @@ build_and_release:
         - package.json
   script:
     - *podman-setup
-    - zypper addrepo https://download.opensuse.org/repositories/devel:languages:nodejs/SLE_12_SP5/devel:languages:nodejs.repo
+    - *node-setup
     - zypper --non-interactive --no-gpg-checks refresh
-    - zypper --non-interactive install go git nodejs14 npm helm
-    - YQ_URL="https://github.com/mikefarah/yq/releases/download/v4.35.2/yq_linux_amd64"
+    - zypper --non-interactive install go git helm
+
+    # Download and install yq
     - curl -sLf ${YQ_URL} -o /usr/bin/yq && chmod +x /usr/bin/yq
-    - npm install -g --unsafe-perm yarn
+
+    # Install dependencies and build extension catalog
     - yarn
     - yarn publish-pkgs -cl -r $REGISTRY -o $IMAGE_NAMESPACE
+
+    # Push all images except the base image
     - podman push `podman images -f reference!=registry.suse.com/bci/bci-base --format "{{index .Names 0}}"`
     - podman logout $REGISTRY
-  tags:
-    - linux

package/scripts/clean

@@ -3,4 +3,4 @@ set -e
 
 cd $(dirname $0)/..
 
-rm -rf dist .nuxt* node_modules/.cache
+rm -rf dist node_modules/.cache

package/scripts/extension/helm/charts/ui-plugin-server/templates/_helpers.tpl

@@ -50,3 +50,14 @@ Selector labels
 app.kubernetes.io/name: {{ include "extension-server.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end }}
+
+{{/*
+Pkg annotations
+*/}}
+{{- define "extension-server.pluginMetadata" -}}
+{{- with .Values.plugin.metadata }}
+{{- range $key, $value := . }}
+{{ $key }}: {{ $value | quote }}
+{{- end }}
+{{- end }}
+{{- end }}

package/scripts/extension/helm/charts/ui-plugin-server/templates/cr.yaml

@@ -10,3 +10,5 @@ spec:
     version: {{ (semver (default .Chart.AppVersion .Values.plugin.versionOverride)).Original }}
     endpoint: http://{{ include "extension-server.fullname" . }}.{{ .Release.Namespace }}.svc
     noCache: {{ .Values.plugin.noCache }}
+    noAuth: {{ .Values.plugin.noAuth }}
+    metadata: {{ include "extension-server.pluginMetadata" . | indent 6 }}

package/scripts/extension/helm/charts/ui-plugin-server/values.yaml

@@ -4,3 +4,5 @@ plugin:
   enabled: true
   versionOverride: ""
   noCache: false
+  noAuth: false
+  metadata: {}

package/scripts/extension/helm/package/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.suse.com/bci/bci-base:15.4
+FROM registry.suse.com/bci/bci-base:15.5
 
 RUN zypper -n install nginx jq
 

package/scripts/extension/helm/scripts/patch

@@ -57,6 +57,18 @@ DESCRIPTION=$(cat ${PACKAGE_JSON} | jq ".description" | tr -d '"')
 ICON=$(cat ${PACKAGE_JSON} | jq ".icon" | tr -d '"')
 KEYWORDS=$(cat ${PACKAGE_JSON} | jq ".keywords")
 HOME=$(cat ${PACKAGE_JSON} | jq ".homepage" | tr -d '"')
+ANNOTATIONS=""
+NO_AUTH="false"
+
+if jq -e '.rancher.annotations | objects' ${PACKAGE_JSON} > /dev/null 2>&1; then
+    ANNOTATIONS=$(jq -r '.rancher.annotations | to_entries[] | @base64' < ${PACKAGE_JSON})
+fi
+
+# Check if the package file specifies noAuth
+if jq -e '.rancher.noAuth' ${PACKAGE_JSON} > /dev/null 2>&1; then
+    NO_AUTH=$(jq -r '.rancher.noAuth' < ${PACKAGE_JSON})
+    echo "noAuth: ${NO_AUTH}"
+fi
 
 if [[ -z ${ORG} ]] || [[ -z ${REPO} ]] || [[ -z ${TAG} ]]; then
     echo "Usage: [CHART=charts/ui-plugin-server] [REGISTRY=""] [ORG=rancher] [REPO=<override-repo>] [TAG=<override-tag>] [PACKAGE_JSON=plugin/package.json] ./scripts/patch <chart>"
@@ -99,3 +111,18 @@ if [[ -n "${HOME}" ]]; then
         yq -i eval ".home = \"${HOME}\"" $CHART/Chart.yaml
     fi
 fi
+
+if [[ -n "${ANNOTATIONS}" ]]; then
+    for ANNOTATION in ${ANNOTATIONS}; do
+        decoded_annotation=$(echo ${ANNOTATION} | base64 --decode)
+        key=$(echo ${decoded_annotation} | jq -r '.key')
+        value=$(echo ${decoded_annotation} | jq -r '.value')
+
+        yq -i eval ".plugin.metadata[\"${key}\"] = \"${value}\"" $CHART/values.yaml
+    done
+fi
+
+# If the extension has noAuth as true then patch this into the values.yaml to override the default of false
+if [ "${NO_AUTH}" == "true" ]; then
+    yq -i eval ".plugin.noAuth=true" $CHART/values.yaml
+fi

package/scripts/extension/publish

@@ -23,7 +23,7 @@ GITHUB_SOURCE=$(git config --get remote.origin.url | sed -e 's/^git@.*:\([[:grap
 GITHUB_BRANCH="main"
 
 usage() {
-  echo "Usage: $0 [<options>] [plugins]"
+  echo "Usage: $0 [<options>] [extensions]"
   echo " options:"
   echo "  -s <repo>    Specify destination GitHub repository (org/name) - defaults to the git origin"
   echo "  -b <branch>  Specify destination GitHub branch"
@@ -86,7 +86,7 @@ shift $((OPTIND-1))
 PLUGINS=( "$@" )
 BUILT="false"
 
-echo -e "${CYAN}${BOLD}Publishing UI Plugins${RESET}"
+echo -e "${CYAN}${BOLD}Publishing UI Extensions${RESET}"
 
 pushd ${BASE_DIR} > /dev/null
 
@@ -184,7 +184,7 @@ if [ "${GITHUB_BUILD}" == "false" ]; then
   if [ "${PODMAN_CONTAINER}" == "false" ]; then
     docker images > /dev/null
     if [ $? -ne 0 ]; then
-      echo "docker is not running - this is required to build container images for the UI Plugins"
+      echo "docker is not running - this is required to build container images for the UI Extensions"
       exit 1
     fi
   fi
@@ -229,7 +229,7 @@ for d in pkg/*/ ; do
       continue
     fi
 
-    echo -e "${CYAN}${BOLD}Building plugin: ${pkg} (${PKG_VERSION}) ${RESET}"
+    echo -e "${CYAN}${BOLD}Building extension: ${pkg} (${PKG_VERSION}) ${RESET}"
 
     echo "Package version: ${PKG_VERSION}"
     echo "Package folder:  ${PKG_NAME}"
@@ -237,10 +237,10 @@ for d in pkg/*/ ; do
     # --------------------------------------------------------------------------------
     # Build the plugin from source
     # --------------------------------------------------------------------------------
-    echo -e "${CYAN}Building plugin from source code${RESET}"
+    echo -e "${CYAN}Building extension from source code${RESET}"
     FORCE_COLOR=1 yarn build-pkg $pkg | cat
 
-    echo -e "${CYAN}Adding plugin code ...${RESET}"
+    echo -e "${CYAN}Adding extension code ...${RESET}"
 
     EXT_FOLDER=${BASE_DIR}/extensions/${pkg}/${PKG_VERSION}
     PKG_DIST="${BASE_DIR}/dist-pkg/${PKG_NAME}"

package/scripts/serve-pkgs

@@ -51,8 +51,6 @@ if (process.env.PORT) {
 
 const base = `http://127.0.0.1:${ port }`;
 
-console.log('');
-console.log(`Serving catalog on ${ base }`);
 console.log('');
 console.log(`Serving packages:`);
 console.log('');

package/scripts/test-plugins-build.sh

@@ -119,7 +119,7 @@ if [ "${SKIP_STANDALONE}" == "false" ]; then
 
   # Package creator
   echo "Verifying package creator package"
-  yarn create @rancher/pkg test-pkg
+  yarn create @rancher/pkg test-pkg -i
 
   echo "Building test package"
   FORCE_COLOR=true yarn build-pkg test-pkg | cat
@@ -152,7 +152,7 @@ if [ $TEST_PERSIST_BUILD != "true" ]; then
   rm -rf ./pkg/test-pkg
 fi
 
-yarn create @rancher/pkg test-pkg -t
+yarn create @rancher/pkg test-pkg -t -i
 cp ${SHELL_DIR}/list/catalog.cattle.io.clusterrepo.vue ./pkg/test-pkg/list
 FORCE_COLOR=true yarn build-pkg test-pkg | cat
 if [ $TEST_PERSIST_BUILD != "true" ]; then
@@ -200,10 +200,10 @@ function clone_repo_test_extension_build() {
   # test build-pkg
   FORCE_COLOR=true yarn build-pkg $PKG_NAME | cat
 
-  # kubewarden has some unit tests and they should be quick to run... Let's check them as well
-  if [ "${REPO_NAME}" == "kubewarden-ui" ]; then
-    yarn test:ci
-  fi
+  # # kubewarden has some unit tests and they should be quick to run... Let's check them as well
+  # if [ "${REPO_NAME}" == "kubewarden-ui" ]; then
+  #   yarn test:ci
+  # fi
 
   # return back to the base path
   popd