Merge branch 'main' into additional_params_tent_2

.github/workflows/backport.yml

@@ -34,7 +34,7 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha }}
       - name: Create backport PRs
         # should be kept in sync with `version`
-        uses: zeebe-io/backport-action@v1.1.0
+        uses: zeebe-io/backport-action@v1.2.0
         with:
           # Config README: https://github.com/zeebe-io/backport-action#backport-action
           github_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}

.github/workflows/build-docs.yml

@@ -83,45 +83,52 @@ jobs:
 
       - name: Configure Git
         run: |
-          git config user.name "mo-auto"
-          git config user.email "54212639+mo-auto@users.noreply.github.com"
+          git config --global user.name "mo-auto"
+          git config --global user.email "54212639+mo-auto@users.noreply.github.com"
           git config --global user.signingkey "${{ steps.import_gpg.outputs.keyid }}"
+          echo "${{ secrets.MOAUTO_WORKFLOW_TOKEN }}" | gh auth login --with-token 
 
       - name: Generate docs
         continue-on-error: true
         env:
           VERSION: ${{ github.event.release.tag_name }}
         run: |
+         mkdir temp && cd temp
+         git clone  https://mo-auto:${{ secrets.MOAUTO_WORKFLOW_TOKEN }}@github.com/JanssenProject/jans.git
+         cd jans
+         git checkout -b cn-jans-update-auto-generated-docs
+         git pull origin cn-jans-update-auto-generated-docs || echo "Nothing to pull"
          echo "Custom work on generating docs can go here."
           
          # Run cn docs 
-         sudo bash ./automation/docs/generated-cn-docs.sh
+         sudo bash ./automation/docs/generated-cn-docs.sh . || echo "something went wrong with generating the cn docs"
           
-         echo "Generating property docs and push to main"
-         sudo bash ./automation/docs/generate-property-docs.sh 
+         echo "Generating auto-generated docs and push to main"
+         sudo bash ./automation/docs/generate-autogenerated-docs.sh . || echo "something went wrong with generating the property docs"
          cd docs
          git add . || echo "Nothing to add"
-         git commit -a -S -m "docs: automated property doc generation" || echo "Nothing to commit"
+         git commit -a -S -m "docs: auto-generated property docs" || echo "Nothing to commit"
          cd ..
+         
+         echo "Add jans-config-api Swagger SPECs that are auto-generated via API annotations"
+         sudo bash ./automation/docs/generate-swagger-specs.sh . || echo "something went wrong with generating the swagger docs"
+         cd jans-config-api/docs
+         git add . || echo "Nothing to add"
+         git commit -a -S -m "docs: auto-generated Swagger SPEC docs" || echo "Nothing to commit"
+         cd ../..
+          
          echo "Generating javadocs"
-         sudo bash ./automation/docs/generate-javadocs.sh
+         sudo bash ./automation/docs/generate-javadocs.sh . || echo "something went wrong with generating the java docs"
          cd docs
          git add . || echo "Nothing to add"
          git commit -a -S -m "docs: generate and add javadocs" || echo "Nothing to commit"
          cd ..
          
-         git push
-        
-         # The below should not be pushed to main
-         echo "Replacing release number markers with actual release number"
-         if [ ! -z "$VERSION" ]; then
-           cd docs
-           # strip v from v1.x.x
-           egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-janssen-version/${VERSION:1}/g"
-           git add . || echo "Nothing to add"
-           git commit -a -S -m "docs: replace release marker with release number" || echo "Nothing to commit"
-           cd ..
-         fi
+         git push --set-upstream origin cn-jans-update-auto-generated-docs
+         MESSAGE="fix(docs): autogenerate docs"
+         PR=$(gh pr create --body "Auto generated docs" --title "${MESSAGE}")
+         cd ../../
+         sudo rm -rf temp
 
       - name: mike deploy ${{ github.event.inputs.version }}
         if: >-
@@ -153,12 +160,11 @@ jobs:
         #if: >-
         # github.event_name != 'workflow_dispatch'
         id: set_versions
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           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 -- "-" | tail -1)
+          echo "Latest is $LATEST and Stable is $STABLE"
           # remove below two lines after first release
           #LATEST="head"
           #STABLE="head"
@@ -188,6 +194,13 @@ jobs:
           git add index.yaml && git update-index --refresh
           cd ..
           # END move generated chart from a previous step
+
+          echo "Replacing release number markers with actual release number"
+          cd ${LATEST}
+          egrep -lRZ --exclude=CONTRIBUTING.md . | xargs -0 -l sed -i -e "s/replace-janssen-version/${LATEST:1}/g"
+          git add . && git update-index --refresh
+          cd ..
+
           echo "${STABLE}" > stable.txt
           git add stable.txt && git update-index --refresh
           git diff-index --quiet HEAD -- || git commit -S -m "Set stable to ${STABLE}"

.github/workflows/build-packages.yml

@@ -6,15 +6,28 @@ on:
     - 'v**'
 
   workflow_dispatch:
-
+    inputs:
+      nightly:
+        description: 'Enable nightly build'
+        default: "false"
+        required: false
+  schedule:
+    - cron: "0 0 * * *"
 jobs:
   publish_binary_packages:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        name: [ubuntu20, el8, suse15]
+        name: [ubuntu22, ubuntu20, el8, suse15]
 
         include:
+          - name: ubuntu22
+            asset_suffix: ~ubuntu22.04_amd64.deb
+            build_files: deb/jammy
+            asset_prefix: '_'
+            asset_path: jans
+            sign_cmd: dpkg-sig -s builder -k DE92BEF14A1A4E542F678B64DC3C790386C73900
+            python_version: 3.8                
           - name: ubuntu20
             asset_suffix: ~ubuntu20.04_amd64.deb
             build_files: deb/focal
@@ -66,8 +79,21 @@ jobs:
     - name: Get latest tag
       id: previoustag
       run: |
-        echo "::set-output name=tag::$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1)"
-        echo "::set-output name=version::$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1 | cut -d 'v' -f 2)"
+        echo "version=$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1 | cut -d 'v' -f 2)" >> $GITHUB_OUTPUT
+        TAG=$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1)
+        echo "tag=$TAG" >> $GITHUB_OUTPUT
+        echo "PACKAGE_PREFIX=jans" >> ${GITHUB_ENV}
+        #If on schedule build nightly packages
+        if [ ${{ github.event_name }} = "schedule" ] || [ ${{ github.event.inputs.nightly }} = true ]; then
+          echo "Activating nightly build"
+          mkdir test && cd test
+          git clone https://github.com/JanssenProject/jans
+          VERSION=$(cat jans/docker-jans-auth-server/Dockerfile | grep "ENV CN_VERSION" | awk -F "[=-]" '{print $2}')
+          cd ../../
+          echo "PACKAGE_PREFIX=jans-nightly-build" >> ${GITHUB_ENV}
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+        fi
+
     - name: Print Version
       run: |
         echo "${{ steps.previoustag.outputs.version }}"
@@ -102,16 +128,18 @@ jobs:
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/${{ matrix.asset_path }}/jans${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}
-        asset_name: jans${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}
+        asset_name: ${{ env.PACKAGE_PREFIX }}${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true
     - name: Upload checksum to release
       id: upload_shas
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/${{ matrix.asset_path }}/jans${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}.sha256sum
-        asset_name: jans${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}.sha256sum
+        asset_name: ${{ env.PACKAGE_PREFIX }}${{ matrix.asset_prefix }}${{ steps.previoustag.outputs.version }}${{ matrix.asset_suffix }}.sha256sum
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true
   build_python_packages:
     runs-on: ubuntu-20.04
     steps:
@@ -141,7 +169,7 @@ jobs:
           sha256sum jans-linux-suse-X86-64-setup.pyz > jans-linux-suse-X86-64-setup.pyz.sha256sum
           cd ../jans-cli-tui
           make zipapp 
-          mv config-cli-tui.pyz jans-cli-tui-linux-suse-X86-64.pyz
+          mv jans-cli-tui.pyz jans-cli-tui-linux-suse-X86-64.pyz
           sha256sum jans-cli-tui-linux-suse-X86-64.pyz > jans-cli-tui-linux-suse-X86-64.pyz.sha256sum
     - name: Set up Python 3.6
       uses: actions/setup-python@v4
@@ -162,7 +190,7 @@ jobs:
         sha256sum jans-linux-ubuntu-X86-64-setup.pyz > jans-linux-ubuntu-X86-64-setup.pyz.sha256sum || echo "Failed"
         cd ../jans-cli-tui
         make zipapp 
-        mv config-cli-tui.pyz jans-cli-tui-linux-ubuntu-X86-64.pyz
+        mv jans-cli-tui.pyz jans-cli-tui-linux-ubuntu-X86-64.pyz
         sha256sum jans-cli-tui-linux-ubuntu-X86-64.pyz > jans-cli-tui-linux-ubuntu-X86-64.pyz.sha256sum
     - uses: actions/cache@v3
       id: cache-installers
@@ -203,7 +231,17 @@ jobs:
     - name: Get latest tag
       id: previoustag
       run: |
-        echo "::set-output name=tag::$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1)"
+        TAG=$(curl https://api.github.com/repos/${{ github.repository }}/releases -s | grep "tag_name" | cut -d '"' -f 4 | grep -o '^\v.*' | head -n 1)
+        echo "tag=$TAG" >> $GITHUB_OUTPUT
+        echo "SETUP_PREFIX=jans-linux" >> ${GITHUB_ENV}
+        echo "TUI_PREFIX=jans-cli-tui-linux" >> ${GITHUB_ENV}
+        #If on schedule build nightly packages
+        if [ ${{ github.event_name }} = "schedule" ] || [ ${{ github.event.inputs.nightly }} = true ]; then
+          echo "Activating nightly build"
+          VERSION=$(cat docker-jans-auth-server/Dockerfile | grep "ENV CN_VERSION" | awk -F "[=-]" '{print $2}')
+          echo "SETUP_PREFIX=jans-linux-$VERSION-nightly-build" >> ${GITHUB_ENV}
+          echo "TUI_PREFIX=jans-cli-tui-linux-$VERSION-nightly-build" >> ${GITHUB_ENV}
+        fi
     - name: Print Version
       run: |
         echo "${{ steps.previoustag.outputs.tag }}"
@@ -214,32 +252,36 @@ jobs:
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/jans-linux-setup/jans-linux-${{ matrix.name }}-X86-64-setup.pyz
-        asset_name: jans-linux-${{ matrix.name }}-X86-64-setup.pyz
+        asset_name: ${{ env.SETUP_PREFIX }}-${{ matrix.name }}-X86-64-setup.pyz
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true
     - name: Upload checksum to release
       id: upload_shas_setup
       continue-on-error: true
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/jans-linux-setup/jans-linux-${{ matrix.name }}-X86-64-setup.pyz.sha256sum
-        asset_name: jans-linux-${{ matrix.name }}-X86-64-setup.pyz.sha256sum
+        asset_name: ${{ env.SETUP_PREFIX }}-${{ matrix.name }}-X86-64-setup.pyz.sha256sum
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true
     - name: Upload binaries to release
       id: upload_binaries_cli
       continue-on-error: true
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/jans-cli-tui/jans-cli-tui-linux-${{ matrix.name }}-X86-64.pyz
-        asset_name: jans-cli-tui-linux-${{ matrix.name }}-X86-64.pyz
+        asset_name: ${{ env.TUI_PREFIX }}-${{ matrix.name }}-X86-64.pyz
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true
     - name: Upload checksum to release
       id: upload_shas_cli
       continue-on-error: true
       uses: svenstaro/upload-release-action@v2
       with:
         repo_token: ${{ secrets.MOAUTO_WORKFLOW_TOKEN }}
         file: ${{github.workspace}}/jans-cli-tui/jans-cli-tui-linux-${{ matrix.name }}-X86-64.pyz.sha256sum
-        asset_name: jans-cli-tui-linux-${{ matrix.name }}-X86-64.pyz.sha256sum
+        asset_name: ${{ env.TUI_PREFIX }}-${{ matrix.name }}-X86-64.pyz.sha256sum
         tag: ${{ steps.previoustag.outputs.tag }}
+        overwrite: true

.github/workflows/flake8-lint.yml

@@ -23,9 +23,9 @@ jobs:
         #TODO: add all python projects paths below "jans-pycloudlib", "jans-cli-tui", "jans-linux-setup"
         python-projects: ["demos/jans-tent"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Python 3.8
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install dependencies

.github/workflows/jans_pycloud_build_package.yml

@@ -49,4 +49,5 @@ jobs:
         run: |
           git add -A
           git commit -S -s -m "chore(jans-pycloudlib): updated build"
+          git push origin ${{ env.PR_DOCKER_BRANCH_NAME }}
           PR=$(gh pr create --assignee "moabu" --base "main" --body "Updated build date. Auto-generated." --label "enhancement,bot" --reviewer "moabu" --title "chore(Dockerfile): updated build dates" || echo "PR Branch is already open")

.github/workflows/release.yaml

@@ -5,23 +5,23 @@ on:
       simple_release_as:
         description: 'Release version for docs'
         required: true
-        default: '1.0.7'
+        default: '1.0.10'
       java_release_as:
         description: 'Release version for the java projects jans-*'
         required: true
-        default: '1.0.7'
+        default: '1.0.10'
       docker_release_as:
         description: 'Release version for the docker images docker-*'
         required: true
-        default: '1.0.7-1'
+        default: '1.0.10-1'
       python_release_as:
         description: 'Release version for the python projects'
         required: true
-        default: '1.0.7'
+        default: '1.0.10'
       mega_release_as:
         description: 'Mega release version'
         required: true
-        default: '1.0.7'
+        default: '1.0.10'
 jobs:
   release-simple-pr:
     runs-on: ubuntu-latest

.github/workflows/test_docker_linux_installer.yml

@@ -20,6 +20,7 @@ jobs:
         # add '"pgsql" when supported
         persistence-backends: ["MYSQL", "PGSQL"]
         python-version: ["3.7"]
+      fail-fast: false
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python3
@@ -42,4 +43,5 @@ jobs:
         export JANS_CLIENT_SECRET=1t5Fin3#security
         export JANS_INSECURE_CLIENT=true
         export TF_ACC=1
+        cd terraform-provider-jans
         go test -v ./...