fix: cherry committed from 4.3

GluuFederation · Jul 5, 2022 · 47794fc · 47794fc
1 parent 398ecaa
commit 47794fc
Show file tree

Hide file tree

Showing 13 changed files with 804 additions and 69 deletions.
diff --git a/.github/workflows/awseks.yml b/.github/workflows/awseks.yml
@@ -36,7 +36,7 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         sudo flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
-    - name: Build Zipapp
+    - name: Install pygluu
       run: |
         sudo apt-get update
         sudo apt-get install build-essential

diff --git a/.github/workflows/central_code_quality_check.yml b/.github/workflows/central_code_quality_check.yml
@@ -8,11 +8,14 @@ on:
     branches:
       - master
       - main
+      - "4.4"
   pull_request:
     branches:
       - master
       - main
+      - "4.4"
   workflow_dispatch:
+
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -39,7 +42,7 @@ jobs:
         if: contains(env.JVM_PROJECTS, github.repository)
         uses: actions/[email protected]
         with:
-          java-version: '11'
+          java-version: 11
           distribution: 'adopt'
 
       - name: Cache SonarCloud packages for JVM based project

diff --git a/.github/workflows/central_sync_workflows.yml b/.github/workflows/central_sync_workflows.yml
@@ -13,9 +13,11 @@ on:
 jobs:
   All_Repos_Common_Workflows:
     runs-on: ubuntu-latest
+
     steps:
       - name: Fetching Local Repository
         uses: actions/checkout@master
+
       - name: Import GPG key
         id: import_gpg
         uses: crazy-max/ghaction-import-gpg@v4

diff --git a/.github/workflows/commit-check.yml b/.github/workflows/commit-check.yml
@@ -20,6 +20,7 @@ jobs:
   check-commit-message:
     name: Check Commit Message
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout Project
         uses: actions/checkout@v2
@@ -30,6 +31,7 @@ jobs:
       - uses: actions/[email protected]
         with:
           node-version: 14
+
       - run: |
           npm install --save-dev @commitlint/{config-conventional,cli}
           echo "module.exports = {extends: ['@commitlint/config-conventional']};" > commitlint.config.js
@@ -73,7 +75,6 @@ jobs:
 #          pattern: '^.+(Resolves|Fixes): \#[0-9]+$'
 #          error: 'You need at least one "Resolves|Fixes: #<issue number>" line.'
 
-
       - name: "[Push] Report Commit Standard Status"
         if: steps.push_get_commit_message.outcome != 'success' && github.event_name == 'push'
         run: |

diff --git a/.github/workflows/couchbase_microk8s.yml b/.github/workflows/couchbase_microk8s.yml
@@ -0,0 +1,217 @@
+name: couchbase
+on:
+  push:
+    branches:
+      - master
+      - main
+      - "4.4"
+    paths:
+      - "helm/**"
+  pull_request:
+    branches:
+      - master
+      - main
+      - "4.4"
+    paths:
+      - "helm/**"
+  workflow_dispatch:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Set up Python 3.7
+      uses: actions/[email protected]
+      with:
+        python-version: 3.7
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update
+        sudo python3 -m pip install --upgrade pip
+        sudo pip3 install setuptools --upgrade
+        sudo pip3 install pyOpenSSL --upgrade
+        sudo pip3 install requests --upgrade
+        sudo apt-get install build-essential
+        sudo pip3 install shiv
+        mkdir /home/runner/work/test
+        cp -r ./* /home/runner/work/test/
+        cd /home/runner/work/test/
+        sudo make zipapp
+
+    - name: Install microk8s
+      run: |
+        sudo snap install microk8s --classic
+        sudo snap alias microk8s.kubectl kubectl
+        sudo microk8s.status --wait-ready
+        sudo microk8s.enable dns registry ingress
+
+
+    - name: Install helm
+      run: |
+        curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3
+        chmod 700 get_helm.sh
+        ./get_helm.sh
+        sudo helm version
+
+    - name: Test 1 settings(LDAP)
+      run: |
+        default_iface=$(awk '$2 == 00000000 { print $1 }' /proc/net/route)
+        ip=$(ip addr show dev "$default_iface" | awk '$1 == "inet" { sub("/.*", "", $2); print $2 }')
+        cat <<EOF > /home/runner/work/test/settings.json
+        {
+          "ACCEPT_GLUU_LICENSE": "Y",
+          "TEST_ENVIRONMENT": "Y",
+          "GLUU_VERSION": "4.4",
+          "GLUU_UPGRADE_TARGET_VERSION": "",
+          "NGINX_INGRESS_NAMESPACE": "ingress-nginx",
+          "GLUU_HELM_RELEASE_NAME": "cn",
+          "NGINX_INGRESS_RELEASE_NAME": "ningress",
+          "INSTALL_GLUU_GATEWAY": "N",
+          "INSTALL_POSTGRES": "N",
+          "POSTGRES_NAMESPACE": "postgres",
+          "KONG_NAMESPACE": "gluu-gateway",
+          "GLUU_GATEWAY_UI_NAMESPACE": "gg-ui",
+          "KONG_PG_USER": "kong",
+          "KONG_PG_PASSWORD": "MUs6#@",
+          "GLUU_GATEWAY_UI_PG_USER": "konga",
+          "GLUU_GATEWAY_UI_PG_PASSWORD": "MUs6#@",
+          "KONG_DATABASE": "kong",
+          "GLUU_GATEWAY_UI_DATABASE": "konga",
+          "POSTGRES_REPLICAS": 3,
+          "POSTGRES_URL": "postgres.postgres.svc.cluster.local",
+          "KONG_HELM_RELEASE_NAME": "kong",
+          "GLUU_GATEWAY_UI_HELM_RELEASE_NAME": "ggui",
+          "USE_ISTIO": "N",
+          "USE_ISTIO_INGRESS": "N",
+          "MIGRATION_ENABLED": "N",
+          "ISTIO_SYSTEM_NAMESPACE": "istio-system",
+          "NODES_IPS": [
+            "$ip"
+          ],
+          "NODES_ZONES": [],
+          "NODES_NAMES": [],
+          "NODE_SSH_KEY": "",
+          "HOST_EXT_IP": "$ip",
+          "VERIFY_EXT_IP": "",
+          "AWS_LB_TYPE": "",
+          "USE_ARN": "",
+          "ARN_AWS_IAM": "",
+          "COUCHBASE_CLUSTER_FILE_OVERRIDE": "Y",
+          "LB_ADD": "",
+          "REDIS_URL": "",
+          "REDIS_TYPE": "",
+          "REDIS_PW": "",
+          "REDIS_USE_SSL": "false",
+          "DEPLOYMENT_ARCH": "microk8s",
+          "PERSISTENCE_BACKEND": "couchbase",
+          "INSTALL_JACKRABBIT": "Y",
+          "JACKRABBIT_STORAGE_SIZE": "4Gi",
+          "JACKRABBIT_URL": "http://jackrabbit:8080",
+          "JACKRABBIT_ADMIN_ID": "admin",
+          "JACKRABBIT_ADMIN_PASSWORD": "admin",
+          "JACKRABBIT_CLUSTER": "Y",
+          "JACKRABBIT_PG_USER": "jackrabbit",
+          "JACKRABBIT_PG_PASSWORD": "jackrabbit",
+          "JACKRABBIT_DATABASE": "jackrabbit",
+          "INSTALL_COUCHBASE": "Y",
+          "COUCHBASE_NAMESPACE": "cbns",
+          "COUCHBASE_VOLUME_TYPE": "io1",
+          "COUCHBASE_CLUSTER_NAME": "cn",
+          "COUCHBASE_URL": "cn.cbns.svc.cluster.local",
+          "COUCHBASE_INDEX_NUM_REPLICA": "0",
+          "COUCHBASE_USER": "cn",
+          "COUCHBASE_SUPERUSER": "admin",
+          "COUCHBASE_PASSWORD": "P@ssw0rd",
+          "COUCHBASE_SUPERUSER_PASSWORD": "P@ssw0rd",
+          "COUCHBASE_CRT": "",
+          "COUCHBASE_CN": "Couchbase CN",
+          "COUCHBASE_SUBJECT_ALT_NAME": "",
+          "COUCHBASE_BUCKET_PREFIX": "cn",
+          "GLUU_LDAP_MULTI_CLUSTER": "N",
+          "COUCHBASE_USE_LOW_RESOURCES": "Y",
+          "COUCHBASE_DATA_NODES": "",
+          "COUCHBASE_QUERY_NODES": "",
+          "COUCHBASE_INDEX_NODES": "",
+          "COUCHBASE_SEARCH_EVENTING_ANALYTICS_NODES": "",
+          "COUCHBASE_GENERAL_STORAGE": "",
+          "COUCHBASE_DATA_STORAGE": "",
+          "COUCHBASE_INDEX_STORAGE": "",
+          "COUCHBASE_QUERY_STORAGE": "",
+          "COUCHBASE_ANALYTICS_STORAGE": "",
+          "COUCHBASE_BACKUP_SCHEDULE": "*/30 * * * *",
+          "COUCHBASE_BACKUP_RESTORE_POINTS": 1,
+          "LDAP_BACKUP_SCHEDULE": "*/30 * * * *",
+          "NUMBER_OF_EXPECTED_USERS": "",
+          "EXPECTED_TRANSACTIONS_PER_SEC": "",
+          "USING_CODE_FLOW": "",
+          "USING_SCIM_FLOW": "",
+          "USING_RESOURCE_OWNER_PASSWORD_CRED_GRANT_FLOW": "",
+          "DEPLOY_MULTI_CLUSTER": "N",
+          "HYBRID_LDAP_HELD_DATA": "",
+          "LDAP_JACKRABBIT_VOLUME": "",
+          "APP_VOLUME_TYPE": 1,
+          "LDAP_STATIC_VOLUME_ID": "",
+          "LDAP_STATIC_DISK_URI": "",
+          "GLUU_CACHE_TYPE": "NATIVE_PERSISTENCE",
+          "GLUU_NAMESPACE": "gluu",
+          "GLUU_FQDN": "demoexample.gluu.org",
+          "COUNTRY_CODE": "US",
+          "STATE": "TX",
+          "EMAIL": "[email protected]",
+          "CITY": "Austin",
+          "ORG_NAME": "Gluu",
+          "GMAIL_ACCOUNT": "",
+          "GOOGLE_NODE_HOME_DIR": "",
+          "IS_GLUU_FQDN_REGISTERED": "N",
+          "LDAP_PW": "nTB5#|",
+          "ADMIN_PW": "@4n,Js",
+          "OXD_SERVER_PW": "n8H0NKuGTXsn",
+          "OXD_APPLICATION_KEYSTORE_CN": "oxd-server",
+          "OXD_ADMIN_KEYSTORE_CN": "oxd-server",
+          "OXD_SERVER_STORAGE": "h2",
+          "LDAP_STORAGE_SIZE": "4Gi",
+          "OXAUTH_REPLICAS": 1,
+          "OXTRUST_REPLICAS": 1,
+          "LDAP_REPLICAS": 1,
+          "FIDO2_REPLICAS": 1,
+          "SCIM_REPLICAS": 1,
+          "OXSHIBBOLETH_REPLICAS": 1,
+          "OXPASSPORT_REPLICAS": 1,
+          "OXD_SERVER_REPLICAS": 1,
+          "CASA_REPLICAS": 1,
+          "RADIUS_REPLICAS": 1,
+          "ENABLE_OXTRUST_API": "N",
+          "ENABLE_OXTRUST_TEST_MODE": "N",
+          "ENABLE_CACHE_REFRESH": "N",
+          "ENABLE_OXD": "Y",
+          "ENABLE_RADIUS": "Y",
+          "ENABLE_OXPASSPORT": "Y",
+          "ENABLE_OXSHIBBOLETH": "Y",
+          "ENABLE_FIDO2": "Y",
+          "ENABLE_SCIM": "Y",
+          "ENABLE_CASA": "Y",
+          "OXAUTH_KEYS_LIFE": 48,
+          "ENABLE_OXAUTH_KEY_ROTATE": "Y",
+          "ENABLE_OXTRUST_API_BOOLEAN": "true",
+          "ENABLE_OXTRUST_TEST_MODE_BOOLEAN": "false",
+          "ENABLE_RADIUS_BOOLEAN": "true",
+          "ENABLE_OXPASSPORT_BOOLEAN": "true",
+          "ENABLE_CASA_BOOLEAN": "true",
+          "ENABLE_SAML_BOOLEAN": "true",
+          "EDIT_IMAGE_NAMES_TAGS": "N",
+          "CONFIRM_PARAMS": "Y",
+          "GLUU_SCIM_PROTECTION_MODE": "OAUTH",
+          "NGINX_LEGACY": "N"
+        }
+    
+    - name: Install Couchbase
+      run: |
+        cd /home/runner/work/test/
+        wget ${{ secrets.cbpackage }}
+        sudo ./pygluu-kubernetes.pyz install-couchbase || { sudo rm -rf ./couchbase; sudo ./pygluu-kubernetes.pyz install-couchbase; }
+        COUCHBASE_IP=$(sudo microk8s.kubectl get po cbgluu-0000 -n cbns --template={{.status.podIP}})
+        cat settings.json | sed 's/"INSTALL_COUCHBASE": "Y"/"INSTALL_COUCHBASE": "N"/g' |  sed -s "[email protected]@$COUCHBASE_IP@g" > tmpfile.py && mv tmpfile.py settings.json
diff --git a/.github/workflows/googlegke.yml b/.github/workflows/googlegke.yml
@@ -35,7 +35,7 @@ jobs:
         # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
         sudo flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
 
-    - name: Build Zipapp
+    - name: Install pygluu
       run: |
         sudo apt-get update
         sudo apt-get install build-essential