Merge branch 'main' into doc-updatefor-ssa-suse

.github/workflows/build-docs.yml

@@ -22,28 +22,36 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version tag (e.g."v5.0.0-14")'
-        default: "v5.0.0-19"
+        description: 'Version tag (e.g."v5.1.6")'
+        default: "nightly"
         required: false
 concurrency:
   group: run-once
   cancel-in-progress: false
 permissions:
   contents: read
+
 jobs:
   build:
-    if: github.repository_owner == 'GluuFederation'
+    permissions:
+      contents: write  # for Git to git push
+    if: github.repository == 'GluuFederation/flex'
     name: Deploy docs
     runs-on: ubuntu-latest
     steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@a4aa98b93cab29d9b1101a6143fb8bce00e2eac4 # v2.7.1
+        with:
+          egress-policy: audit
+
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           fetch-depth: 0
           token: ${{ secrets.MOWORKFLOWTOKEN }}
 
       - name: Set up Python 3.10
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # v5.0.0
         with:
           python-version: "3.10"
           cache: pip
@@ -57,7 +65,7 @@ jobs:
       - name: Checkout flex ${{ github.event.inputs.version }}
         if: >-
           github.event_name == 'workflow_dispatch'
-        uses: actions/checkout@v3
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
         with:
           ref: '${{ github.event.inputs.version }}'
           fetch-depth: 0
@@ -77,7 +85,7 @@ jobs:
 
       - name: Import GPG key
         id: import_gpg
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
         with:
           gpg_private_key: ${{ secrets.MOAUTO_GPG_PRIVATE_KEY }}
           passphrase: ${{ secrets.MOAUTO_GPG_PRIVATE_KEY_PASSPHRASE }}
@@ -94,7 +102,10 @@ jobs:
       - name: Generate docs
         continue-on-error: true
         if: >-
-          github.event_name != 'pull_request'
+          github.event_name == 'release' &&
+          github.event.action == 'published' &&
+          (!github.event.release.draft) &&
+          (startsWith(github.event.release.name, 'v') || github.event.release.name == 'nightly')
         env:
           VERSION: ${{ github.event.release.tag_name }}
         run: |
@@ -133,8 +144,8 @@ jobs:
         if: >-
           github.event_name == 'release' &&
           github.event.action == 'published' &&
-          startsWith(github.event.release.name, 'v') &&
-          !github.event.release.draft
+          (!github.event.release.draft) &&
+          (startsWith(github.event.release.name, 'v') || github.event.release.name == 'nightly')
         env:
           VERSION: ${{ github.event.release.tag_name }}
         run: |
@@ -145,28 +156,30 @@ jobs:
         # github.event_name != 'workflow_dispatch'
         id: set_versions
         run: |
+          GITHUB_EVENT_RELEASE_TAG_NAME="${{ github.event.release.tag_name }}"
           TAGS=$(gh release list -L 1000 -R ${{ github.repository }} | grep -o '^\v.*'| grep -v Draft | cut -f 1 | sed '/-/!{s/$/_/}' | sort -V | sed 's/_$//')
           LATEST=$(echo "${TAGS}" | tail -1)
           STABLE=$(echo "${TAGS}" | grep -v -- "nightly" | tail -1)
+          if [[ "$GITHUB_EVENT_RELEASE_TAG_NAME" == 'nightly' ]]; then
+            LATEST='nightly'
+          fi
           echo "Latest is $LATEST and Stable is $STABLE"
           # remove below two lines after first release
           #LATEST="head"
           #STABLE="head"
           mike alias -u head main
           mike alias -u "${STABLE}" stable
           mike set-default --push stable
-          echo ::set-output name=LATEST::${LATEST}
-          echo ::set-output name=STABLE::${STABLE}
+          echo "LATEST=${LATEST}" >> $GITHUB_OUTPUT
+          echo "STABLE=${STABLE}" >> $GITHUB_OUTPUT
 
       # Ensures the current branch is gh-pages,
       # Creates / updates the "stable" and "latest" plain text files with the corresponding versions
       # Commits if the files were changed
       # Finally pushes if there are unpushed commits
       - name: Create version files
-        if: >-
-          github.event_name != 'pull_request'
-        env:
-          VERSION: ${{ github.event.release.tag_name }}
+        #if: >-
+        #  github.event_name != 'workflow_dispatch'
         run: |
           LATEST=${{ steps.set_versions.outputs.LATEST }}
           STABLE=${{ steps.set_versions.outputs.STABLE }}
@@ -183,8 +196,15 @@ jobs:
 
           echo "Replacing release number markers with actual release number"
           cd ${LATEST}
-          egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-flex-version/${LATEST:1}/g"
-          egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-jans-version/${LATEST:1}/g"
+          if [[ "${LATEST}" == "nightly" ]]; then
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-janssen-version-stable/0.0.0-nightly/g"
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-janssen-version/0.0.0-nightly/g"
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-flex-version-stable/0.0.0-nightly/g"
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-flex-version/0.0.0-nightly/g"
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/v0.0.0-nightly/nightly/g"
+          else
+           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-janssen-version/${LATEST:1}/g"
+          fi
           git add . && git update-index --refresh
           cd ..
 

.github/workflows/build-packages.yml

@@ -100,7 +100,7 @@ jobs:
       id: run_build
       run: |
          cd flex/
-         sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="v1.3.0" --jans-setup-branch="v1.3.0" -download-exit -yes --keep-downloads --keep-setup -force-download
+         sudo python${{ matrix.python_version }} flex_setup.py --jans-branch="main" --jans-setup-branch="main" -download-exit -yes --keep-downloads --keep-setup -force-download
          cp -r /opt/dist flex-src/opt/
          cp -r /opt/jans flex-src/opt/
          touch flex-src/opt/jans/jans-setup/package

admin-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gluu-admin-ui",
-  "version": "5.3.0",
+  "version": "0.0.0",
   "description": "UI to administer the jans-sever features",
   "keywords": [
     "jans-server",

admin-ui/plugins/auth-server/components/Agama/AgamaListPage.js

@@ -97,6 +97,18 @@ function AgamaListPage() {
     });
   }
 
+  const convertFileFrombase64 = (base64String) => {
+    // Decode Base64 string to a Uint8Array
+    const byteCharacters = atob(base64String);
+    const byteArray = new Uint8Array(byteCharacters.length);
+
+    // Fill the Uint8Array with the byte values
+    for (let i = 0; i < byteCharacters.length; i++) {
+      byteArray[i] = byteCharacters.charCodeAt(i);
+    }
+    return byteArray;
+  };
+
   async function fetchRespositoryData() {
     try {
       dispatch(getAgamaRepository());
@@ -110,10 +122,9 @@ function AgamaListPage() {
       dispatch(getJsonConfig({ action: {} }));
     }
   }, []);
-
   useEffect(() => {
     if (agamaFileResponse) {
-      const byteArray = new Uint8Array(agamaFileResponse);
+      const byteArray = convertFileFrombase64(agamaFileResponse);
       let object = {
         name: projectName,
         file: byteArray,
@@ -370,7 +381,6 @@ function AgamaListPage() {
     { name: t("menus.add_community_project"), path: "" },
   ];
 
-
   const handleDeploy = async () => {
     try {
       const repo = agamaRepostoriesList.projects.find(
@@ -379,7 +389,6 @@ function AgamaListPage() {
       setProjectName(repo["repository-name"]);
       dispatch(getAgamaRepositoryFile({ downloadurl: repo["download-link"] }));
     } catch (error) {
-      console.log(error);
       toast.error("File not found");
     }
   };

automation/rancher-partner-charts/questions.yaml

@@ -703,7 +703,7 @@ questions:
 - variable: auth-server.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Auth Server Image tag"
   label: Auth Server image tag
   group: "Images"
@@ -732,7 +732,7 @@ questions:
 - variable: admin-ui.image.tag
   required: true
   type: string
-  default: "5.3.0-1"
+  default: "0.0.0-nightly"
   description: "The AdminUI Image tag"
   label: AdminUI image tag
   group: "Images"
@@ -761,7 +761,7 @@ questions:
 - variable: auth-server-key-rotation.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Auth Server Image tag"
   label: Auth Server KeyRotation image tag
   group: "Images"
@@ -790,7 +790,7 @@ questions:
 - variable: casa.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Casa Image tag"
   label: Casa image tag
   group: "Images"
@@ -819,7 +819,7 @@ questions:
 - variable: config.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Configurator Image tag"
   label: Configurator image tag
   group: "Images"
@@ -848,7 +848,7 @@ questions:
 - variable: config-api.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The ConfigAPI Image tag"
   label: ConfigAPI image tag
   group: "Images"
@@ -877,7 +877,7 @@ questions:
 - variable: fido2.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Fido2 Image tag"
   label: Fido2 image tag
   group: "Images"
@@ -906,7 +906,7 @@ questions:
 - variable: persistence.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The Persistence Image tag"
   label: Persistence image tag
   group: "Images"
@@ -935,7 +935,7 @@ questions:
 - variable: scim.image.tag
   required: true
   type: string
-  default: "1.3.0-1"
+  default: "0.0.0-nightly"
   description: "The SCIM Image tag"
   label: SCIM image tag
   group: "Images"

automation/startflexdemo.sh

@@ -22,7 +22,7 @@ if [[ $GLUU_PERSISTENCE != "MYSQL" ]] && [[ $GLUU_PERSISTENCE != "PGSQL" ]]; the
   exit 1
 fi
 if [[ -z $GLUU_VERSION ]]; then
-  GLUU_VERSION="5.3.0"
+  GLUU_VERSION="0.0.0-nightly"
 fi
 LOG_TARGET="FILE"
 LOG_LEVEL="TRACE"

charts/gluu-all-in-one/Chart.yaml

@@ -3,13 +3,13 @@ annotations:
   artifacthub.io/containsSecurityUpdates: 'true'
   artifacthub.io/images: |
     - name: all-in-one
-      image: ghcr.io/gluufederation/flex/flex-all-in-one:5.3.0-1
+      image: ghcr.io/gluufederation/flex/flex-all-in-one:0.0.0-nightly
   artifacthub.io/license: Apache-2.0
   catalog.cattle.io/certified: partner
   catalog.cattle.io/release-name: gluu-all-in-one
   catalog.cattle.io/display-name: Gluu Flex Cloud Identity and Access Management All-in-One
 apiVersion: v2
-appVersion: "5.3.0"
+appVersion: "0.0.0-nightly"
 icon: >-
   https://gluu.org/docs/gluu-server/favicon.ico
 home: https://docs.gluu.org
@@ -21,4 +21,4 @@ maintainers:
     email: [email protected]
 description: Gluu Access and Identity Management All-in-One Chart. This chart deploys the selected janssen microservice all in one deployment.
 name: gluu-all-in-one
-version: 5.3.0
+version: 0.0.0-nightly