Merge branch 'main' into e2e-quay-rhtap

janus-idp · Feb 28, 2024 · 623061b · 623061b
2 parents 2be9b6d + 09e5903
commit 623061b
Show file tree

Hide file tree

Showing 74 changed files with 1,945 additions and 1,915 deletions.
diff --git a/.ibm/pipelines/openshift-tests.sh b/.ibm/pipelines/openshift-tests.sh
@@ -127,6 +127,7 @@ apply_yaml_files() {
   # re-apply with the updated cluster service account token
   oc apply -f $dir/auth/secrets-rhdh-secrets.yaml --namespace=${NAME_SPACE}
   oc apply -f $dir/resources/config_map/configmap-app-config-rhdh.yaml --namespace=${NAME_SPACE}
+  oc apply -f $dir/resources/config_map/configmap-rbac-policy-rhdh.yaml --namespace=${NAME_SPACE}
 }
 
 run_tests() {
@@ -213,11 +214,7 @@ main() {
 
   add_helm_repos
 
-  GIT_PR_RESPONSE=$(curl -s "https://api.github.com/repos/${GITHUB_ORG_NAME}/${GITHUB_REPOSITORY_NAME}/pulls/${GIT_PR_NUMBER}")
-  LONG_SHA=$(echo "$GIT_PR_RESPONSE" | jq -r '.head.sha')
-  SHORT_SHA=$(git rev-parse --short ${LONG_SHA})
-
-  echo "Tag name with short SHA: ${TAG_NAME}"
+  echo "Tag name : ${TAG_NAME}"
 
   helm upgrade -i ${RELEASE_NAME} -n ${NAME_SPACE} rhdh-chart/backstage --version ${CHART_VERSION} -f $DIR/value_files/${HELM_CHART_VALUE_FILE_NAME} --set global.clusterRouterBase=${K8S_CLUSTER_ROUTER_BASE} --set upstream.backstage.image.tag=${TAG_NAME}
 

diff --git a/.ibm/pipelines/resources/config_map/configmap-app-config-rhdh.yaml b/.ibm/pipelines/resources/config_map/configmap-app-config-rhdh.yaml
@@ -83,6 +83,10 @@ data:
           target: https://github.com/janus-qe/rhdh-test/blob/main/user.yml
           rules:
             - allow: [User]
+        - type: url
+          target: https://github.com/backstage/backstage/blob/master/packages/catalog-model/examples/acme-corp.yaml
+          rules:
+            - allow: [User, Group]
 
 
     dynatrace:
@@ -97,4 +101,11 @@ data:
             - name: argoInstance2
               url: temp
               token: temp
+    permission:
+      enabled: true
+      rbac:
+        policies-csv-file: './rbac/rbac-policy.csv'
+        admin:
+          users:
+            - name: user:default/rhdh-qe 
 
diff --git a/.ibm/pipelines/resources/config_map/configmap-rbac-policy-rhdh.yaml b/.ibm/pipelines/resources/config_map/configmap-rbac-policy-rhdh.yaml
@@ -0,0 +1,20 @@
+kind: ConfigMap
+apiVersion: v1
+metadata:
+  name: rbac-policy
+data:
+  rbac-policy.csv: |
+    p, role:default/guests, catalog.entity.create, create, allow
+    p, role:default/team_a, catalog-entity, read, allow
+    g, user:xyz/user, role:xyz/team_a
+
+    p, role:xyz/team_a, catalog-entity, read, allow
+    p, role:xyz/team_a, catalog.entity.create, create, allow
+    p, role:xyz/team_a, catalog.location.create, create, allow
+    p, role:xyz/team_a, catalog.location.read, read, allow
+
+    p, role:default/rbac_admin, kubernetes.proxy, use, allow
+    p, role:default/rbac_admin, catalog-entity, read, allow
+    p, role:default/rbac_admin, catalog.entity.create, create, allow
+    p, role:default/rbac_admin, catalog.location.create, create, allow
+    p, role:default/rbac_admin, catalog.location.read, read, allow
diff --git a/.ibm/pipelines/value_files/values_showcase.yaml b/.ibm/pipelines/value_files/values_showcase.yaml
@@ -94,6 +94,8 @@ global:
           disabled: false
         - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-acr
           disabled: false
+        - package: ./dynamic-plugins/dist/janus-idp-backstage-plugin-rbac
+          disabled: false
 
 
   # this value will be overriden by 'helm install .... --set global.clusterRouterBase=value'
@@ -191,12 +193,18 @@ upstream:
       # The initContainer below will install dynamic plugins in this volume mount.
       - name: dynamic-plugins-root
         mountPath: /opt/app-root/src/dynamic-plugins-root
+      - name: rbac-policy
+        mountPath: /opt/app-root/src/rbac
     extraVolumes:
       # -- Ephemeral volume that will contain the dynamic plugins installed by the initContainer below at start.
       # To have more control on underlying storage, the [emptyDir](https://docs.openshift.com/container-platform/4.13/storage/understanding-ephemeral-storage.html)
       # could be changed to a [generic ephemeral volume](https://docs.openshift.com/container-platform/4.13/storage/generic-ephemeral-vols.html#generic-ephemeral-vols-procedure_generic-ephemeral-volumes).
       - name: dynamic-plugins-root
         emptyDir: {}
+      - name: rbac-policy
+        configMap: 
+          defaultMode: 420
+          name: rbac-policy
 
       # Volume that will expose the `dynamic-plugins.yaml` file from the `dynamic-plugins` config map.
       # The `dynamic-plugins` config map is created by the helm chart from the content of the `global.dynamic` field.

diff --git a/dynamic-plugins/imports/package.json b/dynamic-plugins/imports/package.json
@@ -16,23 +16,23 @@
     "tar": "6.2.0"
   },
   "peerDependencies": {
-    "@janus-idp/backstage-plugin-3scale-backend": "1.4.5",
-    "@janus-idp/backstage-plugin-aap-backend": "1.5.3",
-    "@janus-idp/backstage-plugin-acr": "1.2.26",
-    "@janus-idp/backstage-plugin-analytics-provider-segment": "1.2.9",
+    "@janus-idp/backstage-plugin-3scale-backend": "1.4.6",
+    "@janus-idp/backstage-plugin-aap-backend": "1.5.4",
+    "@janus-idp/backstage-plugin-acr": "1.2.27",
+    "@janus-idp/backstage-plugin-analytics-provider-segment": "1.2.10",
     "@janus-idp/backstage-plugin-dynamic-plugins-info": "1.0.2",
-    "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.26",
-    "@janus-idp/backstage-plugin-keycloak-backend": "1.8.3",
-    "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.26",
-    "@janus-idp/backstage-plugin-ocm": "3.7.3",
-    "@janus-idp/backstage-plugin-ocm-backend": "3.5.4",
-    "@janus-idp/backstage-plugin-quay": "1.5.7",
-    "@janus-idp/backstage-plugin-rbac": "1.15.1",
-    "@janus-idp/backstage-plugin-tekton": "3.5.8",
-    "@janus-idp/backstage-plugin-topology": "1.18.5",
-    "@janus-idp/backstage-scaffolder-backend-module-quay": "1.3.3",
-    "@janus-idp/backstage-scaffolder-backend-module-regex": "1.3.3",
-    "@janus-idp/backstage-scaffolder-backend-module-servicenow": "1.3.3",
-    "@janus-idp/backstage-scaffolder-backend-module-sonarqube": "1.3.3"
+    "@janus-idp/backstage-plugin-jfrog-artifactory": "1.2.27",
+    "@janus-idp/backstage-plugin-keycloak-backend": "1.8.4",
+    "@janus-idp/backstage-plugin-nexus-repository-manager": "1.4.27",
+    "@janus-idp/backstage-plugin-ocm": "3.7.4",
+    "@janus-idp/backstage-plugin-ocm-backend": "3.5.5",
+    "@janus-idp/backstage-plugin-quay": "1.5.8",
+    "@janus-idp/backstage-plugin-rbac": "1.15.2",
+    "@janus-idp/backstage-plugin-tekton": "3.5.9",
+    "@janus-idp/backstage-plugin-topology": "1.18.6",
+    "@janus-idp/backstage-scaffolder-backend-module-quay": "1.3.4",
+    "@janus-idp/backstage-scaffolder-backend-module-regex": "1.3.4",
+    "@janus-idp/backstage-scaffolder-backend-module-servicenow": "1.3.4",
+    "@janus-idp/backstage-scaffolder-backend-module-sonarqube": "1.3.4"
   }
 }
diff --git a/...mic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/dist-dynamic/yarn.lock b/...mic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/dist-dynamic/yarn.lock
@@ -90,16 +90,16 @@
   integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
 "@types/node@*":
-  version "20.11.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
-  integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
+  version "20.11.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.21.tgz#ad67e65652f7be15686e2df87a38076a81c5e9c5"
+  integrity sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==
   dependencies:
     undici-types "~5.26.4"
 
 "@types/qs@*":
-  version "6.9.11"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
-  integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==
+  version "6.9.12"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.12.tgz#afa96b383a3a6fdc859453a1892d41b607fc7756"
+  integrity sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==
 
 "@types/range-parser@*":
   version "1.2.7"

diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops-backend-dynamic/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json b/dynamic-plugins/wrappers/backstage-plugin-azure-devops/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/...mic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud/package.json b/...mic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-cloud/package.json
@@ -33,7 +33,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/.../wrappers/backstage-plugin-catalog-backend-module-bitbucket-server/dist-dynamic/yarn.lock b/.../wrappers/backstage-plugin-catalog-backend-module-bitbucket-server/dist-dynamic/yarn.lock
@@ -48,9 +48,9 @@
     form-data "^4.0.0"
 
 "@types/node@*":
-  version "20.11.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
-  integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
+  version "20.11.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.21.tgz#ad67e65652f7be15686e2df87a38076a81c5e9c5"
+  integrity sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==
   dependencies:
     undici-types "~5.26.4"
 

diff --git a/...ic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-server/package.json b/...ic-plugins/wrappers/backstage-plugin-catalog-backend-module-bitbucket-server/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-github-dynamic/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/...-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json b/...-plugins/wrappers/backstage-plugin-catalog-backend-module-github-org-dynamic/package.json
@@ -30,7 +30,7 @@
     "@backstage/plugin-catalog-backend-module-github": "0.5.2"
   },
   "devDependencies": {
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-catalog-backend-module-gitlab-dynamic/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json b/dynamic-plugins/wrappers/backstage-plugin-dynatrace/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-actions/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json b/dynamic-plugins/wrappers/backstage-plugin-github-issues/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/dist-dynamic/yarn.lock b/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/dist-dynamic/yarn.lock
@@ -90,16 +90,16 @@
   integrity sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==
 
 "@types/node@*":
-  version "20.11.20"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.20.tgz#f0a2aee575215149a62784210ad88b3a34843659"
-  integrity sha512-7/rR21OS+fq8IyHTgtLkDK949uzsa6n8BkziAKtPVpugIkO6D+/ooXMvzXxDnZrmtXVfjb1bKQafYpb8s89LOg==
+  version "20.11.21"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.21.tgz#ad67e65652f7be15686e2df87a38076a81c5e9c5"
+  integrity sha512-/ySDLGscFPNasfqStUuWWPfL78jompfIoVzLJPVVAHBh6rpG68+pI2Gk+fNLeI8/f1yPYL4s46EleVIc20F1Ow==
   dependencies:
     undici-types "~5.26.4"
 
 "@types/qs@*":
-  version "6.9.11"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.11.tgz#208d8a30bc507bd82e03ada29e4732ea46a6bbda"
-  integrity sha512-oGk0gmhnEJK4Yyk+oI7EfXsLayXatCWPHary1MtcmbAifkobT9cM9yutG/hZKIseOU0MqbIwQ/u2nn/Gb+ltuQ==
+  version "6.9.12"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.12.tgz#afa96b383a3a6fdc859453a1892d41b607fc7756"
+  integrity sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==
 
 "@types/range-parser@*":
   version "1.2.7"

diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins-backend-dynamic/package.json
@@ -30,7 +30,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",

diff --git a/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json b/dynamic-plugins/wrappers/backstage-plugin-jenkins/package.json
@@ -24,7 +24,7 @@
   },
   "devDependencies": {
     "@backstage/cli": "0.25.2",
-    "@janus-idp/cli": "1.7.3"
+    "@janus-idp/cli": "1.7.4"
   },
   "files": [
     "dist",