Merge branch 'reboot/throttling' of https://github.com/zowe/api-layer …

…into reboot/throttling
zowe · Oct 25, 2024 · da43b95 · da43b95
2 parents 5c0eb93 + 136004d
commit da43b95
Show file tree

Hide file tree

Showing 300 changed files with 12,862 additions and 14,156 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -18,8 +18,8 @@ runs:
         -   name: Set up Node
             uses: actions/setup-node@v4
             with:
-                node-version: '18'
-        -   run: npm install -g npm@9.3.1
+                node-version: '20'
+        -   run: npm install -g npm@10.7.0
             shell: bash
         -   name: Grant execute permission for gradlew
             run: chmod +x gradlew
@@ -73,4 +73,4 @@ runs:
                 path: |
                     ~/.npm
                     zss-sample-service/node_modules
-                key: ${{ runner.OS }}-zss-sample-service-node-${{ hashFiles('zss-sample-service/*.json') }}
+                key: ${{ runner.OS }}-zss-sample-service-node-${{ hashFiles('zss-sample-service/*.json') }}
diff --git a/.github/workflows/automated-release.yml b/.github/workflows/automated-release.yml
@@ -23,7 +23,7 @@ jobs:
         timeout-minutes: 40
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
                   token: ${{ secrets.ZOWE_ROBOT_TOKEN }}
@@ -43,11 +43,12 @@ jobs:
               run: git config user.name "Zowe Robot"
 
             - name: Release to NPM automatic
+              shell: bash
               run: |
                   cd onboarding-enabler-nodejs
                   echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
                   echo "registry=$DIST_REGISTRY" >> ~/.npmrc
-                  npm version ${{ github.event.inputs.scope || env.DEFAULT_SCOPE }}
+                  npm version ${{ github.event.inputs.scope || env.DEFAULT_SCOPE }} --allow-same-version
                   npm publish --access public
                   git add package.json
                   git add package-lock.json
@@ -62,7 +63,14 @@ jobs:
                   DIST_REGISTRY: https://registry.npmjs.org/
 
             - name: Release with Gradle automatic
-              run: ./gradlew release -x test -x checkstyleTest -Prelease.useAutomaticVersion=true -Prelease.scope=${{ github.event.inputs.scope || env.DEFAULT_SCOPE }} -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_USERNAME
+              shell: bash
+              run: |
+                  ./gradlew release -x test -x checkstyleTest -Prelease.useAutomaticVersion=true -Prelease.scope=${{ github.event.inputs.scope || env.DEFAULT_SCOPE }} -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
+                  released_version=$(cat gradle.properties | grep "version=" | sed "s/version=//g")
+                  sed -i "/REACT_APP_ZOWE_BUILD_INFO=/c\REACT_APP_ZOWE_BUILD_INFO=${released_version}" api-catalog-ui/frontend/.env
+                  git add api-catalog-ui/frontend/.env
+                  git commit -m "[skip ci] Update version"
+                  git push
               env:
                   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
                   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
@@ -82,5 +90,6 @@ jobs:
                         caching-service/build/reports/**
                         api-catalog-services/build/reports/**
                         zaas-service/build/reports/**
+                        /home/runner/.npm/logs/**
 
             - uses: ./.github/actions/teardown
diff --git a/.github/workflows/binary-snapshot-release.yml b/.github/workflows/binary-snapshot-release.yml
@@ -12,7 +12,7 @@ jobs:
         timeout-minutes: 40
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/binary-specific-release.yml b/.github/workflows/binary-specific-release.yml
@@ -17,7 +17,7 @@ jobs:
         timeout-minutes: 40
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
                   token: ${{ secrets.ZOWE_ROBOT_TOKEN }}
@@ -40,11 +40,12 @@ jobs:
               run: git config user.name "Zowe Robot"
 
             - name: Release to NPM automatic
+              shell: bash
               run: |
                   cd onboarding-enabler-nodejs
                   echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" > ~/.npmrc
                   echo "registry=$DIST_REGISTRY" >> ~/.npmrc
-                  npm version ${{ github.event.inputs.release_version }}
+                  npm version ${{ github.event.inputs.release_version }} --allow-same-version
                   npm publish --access public
                   git add package.json
                   git add package-lock.json
@@ -58,7 +59,14 @@ jobs:
                   DIST_REGISTRY: https://registry.npmjs.org/
 
             - name: Release with Gradle automatic
-              run: ./gradlew release -x test -x checkstyleTest -Prelease.useAutomaticVersion=true -Prelease.releaseVersion=${{ github.event.inputs.release_version }} -Prelease.newVersion=${{ github.event.inputs.new_version }} -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_USERNAME
+              shell: bash
+              run: |
+                  ./gradlew release -x test -x checkstyleTest -Prelease.useAutomaticVersion=true -Prelease.releaseVersion=${{ github.event.inputs.release_version }} -Prelease.newVersion=${{ github.event.inputs.new_version }} -Pzowe.deploy.username=$ARTIFACTORY_USERNAME -Pzowe.deploy.password=$ARTIFACTORY_PASSWORD -Partifactory_user=$ARTIFACTORY_USERNAME -Partifactory_password=$ARTIFACTORY_PASSWORD
+                  released_version=$(cat gradle.properties | grep "version=" | sed "s/version=//g")
+                  sed -i "/REACT_APP_ZOWE_BUILD_INFO=/c\REACT_APP_ZOWE_BUILD_INFO=${released_version}" api-catalog-ui/frontend/.env
+                  git add api-catalog-ui/frontend/.env
+                  git commit -m "[skip ci] Update version"
+                  git push
               env:
                   ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
                   ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
@@ -76,5 +84,6 @@ jobs:
                     caching-service/build/reports/**
                     api-catalog-services/build/reports/**
                     zaas-service/build/reports/**
+                    /home/runner/.npm/logs/**
 
             - uses: ./.github/actions/teardown
diff --git a/.github/workflows/branch-snapshot-release.yml b/.github/workflows/branch-snapshot-release.yml
@@ -19,7 +19,7 @@ jobs:
         timeout-minutes: 30
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/build-conformant-images.yml b/.github/workflows/build-conformant-images.yml
@@ -50,7 +50,7 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ inputs.service == 'all' }}
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 
@@ -91,7 +91,7 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ inputs.service == 'all' }}
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 
@@ -142,7 +142,7 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ inputs.service == 'all' }}
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 
@@ -178,7 +178,7 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ inputs.service != 'all' }}
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 
@@ -235,7 +235,7 @@ jobs:
         runs-on: ubuntu-latest
         if: ${{ inputs.service != 'all' }}
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -21,12 +21,12 @@ jobs:
 
         steps:
             - name: Set up Node
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: '18'
 
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.ref_name }}
 

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -1,6 +1,7 @@
 name: "Flag the error message changes and label the PR"
 
 on:
+    workflow_dispatch:
     schedule:
         # * is a special character in YAML so you have to quote this string
         - cron:  '0 0 * * 5'
@@ -16,20 +17,20 @@ jobs:
 
         steps:
             - name: Set up Node
-              uses: actions/setup-node@v2
+              uses: actions/setup-node@v4
               with:
                   node-version: '18'
 
             - name: Checkout repository
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   ref: ${{ github.head_ref }}
 
             - name: Generate and compare the Error messages
               run: |
                   git clone https://zowe-robot:${{ secrets.ZOWE_ROBOT_TOKEN }}@github.com/zowe/docs-site.git
                   cd docs-site
-                  git checkout v3-doc-branch
+                  git checkout master
                   cd ../docs/docgen/
                   java -jar Docgen-1.0.jar ./config.yml
                   cp ../../docs-site/docs/troubleshoot/troubleshoot-apiml-error-codes.md original-codes.md
@@ -42,7 +43,7 @@ jobs:
 
 
             - name: Store results
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: ErrorMessage-${{ env.JOB_ID }}
                   path: |

diff --git a/.github/workflows/image-publish-branch.yml b/.github/workflows/image-publish-branch.yml
@@ -22,7 +22,7 @@ jobs:
     build-services:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/image-snapshot-release.yml b/.github/workflows/image-snapshot-release.yml
@@ -8,7 +8,7 @@ jobs:
     build-services:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 

diff --git a/.github/workflows/image-specific-release.yml b/.github/workflows/image-specific-release.yml
@@ -11,14 +11,14 @@ jobs:
     build-services:
         runs-on: ubuntu-latest
         steps:
-            -   uses: actions/checkout@v3
+            -   uses: actions/checkout@v4
                 with:
                     ref: ${{ github.head_ref }}
 
             -   uses: ./.github/actions/setup
 
             -   name: Build services
-                run: ./gradlew clean build -x test
+                run: ./gradlew clean build -x test -x npmTest
 
             -   uses: ./.github/actions/teardown