@continuoussecuritytooling/keycloak-reporter 0.5.0 → 0.5.1

package/.ct.yaml

@@ -2,5 +2,5 @@ chart-dirs:
   - charts/keycloak-reporter/
 debug: true
 target-branch: main
-check-version-increment: true
+check-version-increment: false
 validate-maintainers: false

package/.github/workflows/pipeline.yml

@@ -1,13 +1,16 @@
 name: Build
 
 on:
+  pull_request:
   merge_group:
   push:
+    branches:
+      - develop
 
 jobs:
   build:
-    name: "Build and Test on Node ${{ matrix.node_version }} and ${{ matrix.os }}"
-    runs-on: "${{ matrix.os }}"
+    name: 'Build and Test on Node ${{ matrix.node_version }} and ${{ matrix.os }}'
+    runs-on: '${{ matrix.os }}'
     strategy:
       matrix:
         node_version:
@@ -19,10 +22,10 @@ jobs:
           - windows-latest
     steps:
       - uses: actions/checkout@v4
-      - name: "Use Node.js ${{ matrix.node_version }}"
+      - name: 'Use Node.js ${{ matrix.node_version }}'
         uses: actions/setup-node@v3
         with:
-          node-version: "${{ matrix.node_version }}"
+          node-version: '${{ matrix.node_version }}'
       - name: npm build and test
         run: |
           npm run clean
@@ -30,7 +33,7 @@ jobs:
           npm run test
 
   chart:
-    name: "Build and Test Helm Chart"
+    name: 'Build and Test Helm Chart'
     runs-on: ubuntu-latest
 
     steps:
@@ -46,7 +49,7 @@ jobs:
 
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: '3.9'
           check-latest: true
 
       - name: Helm Chart Testing
@@ -62,7 +65,7 @@ jobs:
 
       - name: Run chart-testing (lint)
         if: steps.list-changed.outputs.changed == 'true'
-        run: ct lint --target-branch ${{ github.event.repository.default_branch }} --check-version-increment false
+        run: ct lint --target-branch ${{ github.event.repository.default_branch }}
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
@@ -78,26 +81,25 @@ jobs:
           path: dist
 
   end2end:
-    name: "End2End Test on Node ${{ matrix.node_version }} and ${{ matrix.os }}"
-    runs-on: "${{ matrix.os }}"
+    name: 'End2End Test on Node ${{ matrix.node_version }} and ${{ matrix.os }}'
+    runs-on: '${{ matrix.os }}'
     strategy:
       matrix:
         node_version:
           - 18
-          - 20
         os:
           - ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: "Use Node.js ${{ matrix.node_version }}"
+      - name: 'Use Node.js ${{ matrix.node_version }}'
         uses: actions/setup-node@v3
         with:
-          node-version: "${{ matrix.node_version }}"
+          node-version: '${{ matrix.node_version }}'
       - name: Install Java
         uses: actions/setup-java@v3
         with:
-          distribution: "temurin" # See 'Supported distributions' for available options
-          java-version: "17"
+          distribution: 'temurin' # See 'Supported distributions' for available options
+          java-version: '17'
       - name: npm build and test
         run: |
           npm run clean
@@ -112,10 +114,13 @@ jobs:
         run: .bin/wait-for-server.sh
 
       - name: Run end2end tests
-        run: npm run end2end:test
+        run: |
+          env
+          npm run end2end:test
         env:
           WEBHOOK_TESTING_TEAMS: ${{ secrets.WEBHOOK_TESTING_TEAMS }}
           WEBHOOK_TESTING_SLACK: ${{ secrets.WEBHOOK_TESTING_SLACK }}
+          WEBHOOK_ADDITIONAL_MESSAGE: ${{ github.head_ref || github.ref_name }}
 
   package:
     name: Build Container Image
@@ -129,8 +134,8 @@ jobs:
       - uses: actions/setup-node@v3
         # TODO: Support Node 16+
         with:
-          node-version: "16"
-      - name: "Build Package"
+          node-version: '16'
+      - name: 'Build Package'
         run: |
           npm run clean
           npm run build
@@ -139,7 +144,7 @@ jobs:
         uses: redhat-actions/buildah-build@v2
         with:
           image: continuoussecuritytooling/keycloak-reporting-cli
-          tags: "v1 ${{ github.sha }}"
+          tags: 'v1 ${{ github.sha }}'
           containerfiles: |
             ./Dockerfile
       - name: Push To Docker Hub

package/.github/workflows/release.yml

@@ -25,13 +25,33 @@ jobs:
 
       - name: Install Helm
         uses: azure/setup-helm@v3
+      - name: Install Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.9'
+          check-latest: true
+      - name: Set up chart-testing
+        uses: helm/chart-testing-action@v2.4.0
 
       - name: Run chart-testing (lint)
-        run: ct lint --target-branch
+        run: ct lint --config .ct.yaml 
 
       - name: Run chart-releaser
         uses: helm/chart-releaser-action@v1.5.0
         with:
-            charts_dir: charts/
+          charts_dir: charts/
         env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          CR_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
+
+      - name: Login to GitHub Container Registry
+        run: |
+          echo ${{ secrets.CT_OCI_GITHUB_TOKEN }} | helm registry login ghcr.io -u $ --password-stdin
+
+      - name: Push Charts to GHCR
+        run: |
+          for pkg in .cr-release-packages/*; do
+            if [ -z "${pkg:-}" ]; then
+              break
+            fi
+            helm push "${pkg}" oci://ghcr.io/cloudtooling/helm-charts
+          done

package/Dockerfile

@@ -1,4 +1,6 @@
-FROM node:16
+FROM node:18
+
+LABEL org.opencontainers.image.source https://github.com/ContinuousSecurityTooling/keycloak-reporter
 
 ENV CONFIG_FILE=/app/config.json
 
@@ -6,6 +8,6 @@ COPY dist/ docker_entrypoint.sh package.json /app
 
 WORKDIR /app
 
-RUN cd /app &&  npm i
+RUN cd /app && npm i
 
 ENTRYPOINT ["/app/docker_entrypoint.sh"]

package/README.md

@@ -3,9 +3,8 @@
 
 [![License](https://img.shields.io/github/license/ContinuousSecurityTooling/keycloak-reporter.svg)](LICENSE)
 [![CI](https://github.com/ContinuousSecurityTooling/keycloak-reporter/actions/workflows/pipeline.yml/badge.svg)](https://github.com/ContinuousSecurityTooling/keycloak-reporter/actions/workflows/pipeline.yml)
-[![npm version](https://badge.fury.io/js/%40ContinuousSecurityTooling%2Fkeycloak-reporter.svg)](https://www.npmjs.com/package/@continuoussecuritytooling/keycloak-reporter)
-[![npm downloads](https://img.shields.io/npm/dm/%40ContinuousSecurityTooling%2Fkeycloak-reporter.svg)](https://www.npmjs.com/package/@continuoussecuritytooling/keycloak-reporter)
-[![npm downloads](https://img.shields.io/npm/dt/%40ContinuousSecurityTooling%2Fkeycloak-reporter.svg)](https://www.npmjs.com/package/@continuoussecuritytooling/keycloak-reporter)
+[![npm version](https://badge.fury.io/js/@continuoussecuritytooling%2Fkeycloak-reporter.svg)](https://www.npmjs.com/package/@continuoussecuritytooling/keycloak-reporter)
+[![npm downloads](https://img.shields.io/npm/dm/@continuoussecuritytooling%2Fkeycloak-reporter.svg)](https://www.npmjs.com/package/@continuoussecuritytooling/keycloak-reporter)
 [![Docker Stars](https://img.shields.io/docker/stars/continuoussecuritytooling/keycloak-reporting-cli.svg)](https://hub.docker.com/r/continuoussecuritytooling/keycloak-reporting-cli/)
 [![Known Vulnerabilities](https://snyk.io/test/github/ContinuousSecurityTooling/keycloak-reporter/badge.svg)](https://snyk.io/test/github/ContinuousSecurityTooling/keycloak-reporter)
 
@@ -57,13 +56,13 @@ Valid commands are:
 
 ## Advanced
 
-
 ### Helm
-~
 
-helm repo add cloud-tooling https://cloudtooling.github.io/helm-charts/
+To install the Helm Chart use the OCI Package:
 
-cloud-tooling/keycloak-reporter
+```
+helm install keycloak-reporter oci://cloudtooling/helm-charts
+```
 
 ### Config file
 

package/charts/keycloak-reporter/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.5.0
+version: 1.0.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

package/charts/keycloak-reporter/templates/_helpers.tpl

@@ -60,3 +60,24 @@ Create the name of the service account to use
 {{- default "default" .Values.serviceAccount.name }}
 {{- end }}
 {{- end }}
+
+}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "keycloak-reporter.cronJobs" }}
+{{- $cronJobs := list -}}
+{{- if .Values.cronjobs.users }}
+{{- $userCron := dict "name" "users" "script" "listUsers" "schedule" .Values.cronjobs.users }}
+{{-   $cronJobs = printf "%s" $userCron . | append $cronJobs -}}
+{{- end }}
+{{- if .Values.cronjobs.clients }}
+{{- $clientCron := dict "name" "users" "script" "listClients" "schedule" .Values.cronjobs.clients }}
+{{-   $cronJobs = printf "%s" $clientCron . | append $cronJobs -}}
+{{- end }}
+{{ join "," $cronJobs }}
+{{- end }}
+
+
+

package/charts/keycloak-reporter/templates/cronjob.yaml

@@ -1,5 +1,5 @@
-{{- $fullName := include "keycloak-reporter.fullname" . -}}
-{{- range .Values.cronjobs }}
+{{- $fullName := include "keycloak-reporter.fullname" . }}
+{{- range include "keycloak-reporter.cronJobs" $ | split "," }}
 apiVersion: batch/v1
 kind: CronJob
 metadata:
@@ -25,7 +25,8 @@ spec:
               command:
                 - /bin/sh
                 - -c
-                - {{ .script }}
+                - |
+                  node /app/cli.js {{ .script }}
               env:
                 - name: CONFIG_FILE
                   value: "/app/config.json"
@@ -35,6 +36,7 @@ spec:
               volumeMounts:
                 - name: config-file
                   mountPath: "/app/config.json"
+                  subPath: "config.json"
                   readOnly: true
                 {{- if ($.Values.keycloak.config.volumes).reports }}
                 - name: reports-dir

package/charts/keycloak-reporter/values.yaml

@@ -8,7 +8,7 @@ image:
   repository: continuoussecuritytooling/keycloak-reporting-cli
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "latest"
+  #tag: "latest"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -52,12 +52,8 @@ keycloak:
     reports: ""
 
 cronjobs:
-  - name: clients
-    script: /app/index.js listClients
-    schedule: 0 0 1 */3 *
-  - name: users
-    script: /app/index.js listUsers
-    schedule: 0 0 1 */3 *
+  clients: "0 0 1 */3 *"
+  users: "0 0 1 */3 *"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious

package/cli.ts

@@ -100,26 +100,28 @@ yargs(hideBin(process.argv))
     () => {},
     async (argv) => {
       const users = await listUsers(<Options>{
-        clientId: argv.clientId ? (argv.clientId as string) : config.clientId,
-        clientSecret: argv.clientSecret
-          ? (argv.clientSecret as string)
-          : config.clientSecret,
-        rootUrl: argv.url ? (argv.url as string) : config.url
+        clientId: config.clientId ? config.clientId : (argv.clientId as string),
+        clientSecret: config.clientSecret
+          ? config.clientSecret
+          : (argv.clientSecret as string),
+        rootUrl: config.url ? config.url : (argv.url as string)
       });
       await convert(
-        argv.format as string,
-        argv.output as string,
+        config.format ? config.format : (argv.format as string),
+        config.output ? config.output : (argv.output as string),
         {
           name: 'user_listing',
-          directory: argv.reports as string
+          directory: argv.reports ? (argv.reports as string) : config.reports
         },
         new WebhookConfig(
-          argv.webhookType as string,
-          argv.webhookUrl as string,
+          config.webhookType
+            ? config.webhookType
+            : (argv.webhookType as string),
+          config.webhookUrl ? config.webhookUrl : (argv.webhookUrl as string),
           'User Listing',
-          argv.webhookMessage
-            ? (argv.webhookMessage as string)
-            : config.webhookMessage
+          config.webhookMessage
+            ? config.webhookMessage
+            : (argv.webhookMessage as string)
         ),
         users
       );
@@ -132,26 +134,28 @@ yargs(hideBin(process.argv))
     () => {},
     async (argv) => {
       const clients = await listClients(<Options>{
-        clientId: argv.clientId ? (argv.clientId as string) : config.clientId,
-        clientSecret: argv.clientSecret
-          ? (argv.clientSecret as string)
-          : config.clientSecret,
-        rootUrl: argv.url ? (argv.url as string) : config.url
+        clientId: config.clientId ? config.clientId : (argv.clientId as string),
+        clientSecret: config.clientSecret
+          ? config.clientSecret
+          : (argv.clientSecret as string),
+        rootUrl: config.url ? config.url : (argv.url as string)
       });
       await convert(
-        argv.format as string,
-        argv.output as string,
+        config.format ? config.format : (argv.format as string),
+        config.output ? config.output : (argv.output as string),
         {
           name: 'client_listing',
-          directory: argv.reports as string
+          directory: argv.reports ? (argv.reports as string) : config.reports
         },
         new WebhookConfig(
-          argv.webhookType as string,
-          argv.webhookUrl as string,
+          config.webhookType
+            ? config.webhookType
+            : (argv.webhookType as string),
+          config.webhookUrl ? config.webhookUrl : (argv.webhookUrl as string),
           'Client Listing',
-          argv.webhookMessage
-            ? (argv.webhookMessage as string)
-            : config.webhookMessage
+          config.webhookMessage
+            ? config.webhookMessage
+            : (argv.webhookMessage as string)
         ),
         clients
       );

package/config.json

@@ -0,0 +1,9 @@
+{ 
+    "url": "https://id.m13t.de",
+    "clientId": "admin-cli",
+    "clientSecret": "PWkJ98Atq36QFP5Z25YXJDWs4tvsGvkI",
+    "output": "webhook",
+    "webhookType": "teams",
+    "webhookUrl": "https://m13t4mgmt.webhook.office.com/webhookb2/02950819-c8ca-4c83-9751-808d801e8810@09f6f098-3af9-474c-a398-d17786fff1bf/IncomingWebhook/b06222e267a04255aaa32a341acb1749/a4f92b5b-01c7-40a8-91ff-0695e08d76ff",
+    "webhookMessage": "TEST"
+}

package/dist/cli.js

@@ -17,6 +17,7 @@ class ReportConfig {
 }
 async function convert(format, output, reports, config, json) {
     let outputContent;
+    console.log(output);
     switch (format) {
         case 'csv':
             outputContent = (await convertJSON2CSV(json)).toString();
@@ -64,10 +65,12 @@ yargs(hideBin(process.argv))
             : config.clientSecret,
         rootUrl: argv.url ? argv.url : config.url
     });
-    await convert(argv.format, argv.output, {
+    await convert(config.format ? config.format : argv.format, config.output ? config.output : argv.output, {
         name: 'user_listing',
-        directory: argv.reports
-    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'User Listing', argv.webhookMessage
+        directory: argv.reports ? argv.reports : config.reports
+    }, new WebhookConfig(config.webhookType
+        ? config.webhookType
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : argv.webhookUrl, 'User Listing', argv.webhookMessage
         ? argv.webhookMessage
         : config.webhookMessage), users);
 })
@@ -81,10 +84,12 @@ yargs(hideBin(process.argv))
             : config.clientSecret,
         rootUrl: argv.url ? argv.url : config.url
     });
-    await convert(argv.format, argv.output, {
+    await convert(config.format ? config.format : argv.format, config.output ? config.output : argv.output, {
         name: 'client_listing',
-        directory: argv.reports
-    }, new WebhookConfig(argv.webhookType, argv.webhookUrl, 'Client Listing', argv.webhookMessage
+        directory: argv.reports ? argv.reports : config.reports
+    }, new WebhookConfig(config.webhookType
+        ? config.webhookType
+        : argv.webhookType, config.webhookUrl ? config.webhookUrl : argv.webhookUrl, 'Client Listing', argv.webhookMessage
         ? argv.webhookMessage
         : config.webhookMessage), clients);
 })

package/dist/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,SAAS,EACT,WAAW,EAEX,eAAe,EACf,YAAY,EACb,MAAM,YAAY,CAAC;AACpB,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,MAAM,aAAa;IAKjB,YAAY,IAAY,EAAE,GAAW,EAAE,KAAa,EAAE,OAAgB;QACpE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CACF;AAED,MAAM,YAAY;CAGjB;AAED,KAAK,UAAU,OAAO,CACpB,MAAc,EACd,MAAc,EACd,OAAqB,EACrB,MAAqB,EACrB,IAAY;IAEZ,IAAI,aAAqB,CAAC;IAC1B,QAAQ,MAAM,EAAE;QACd,KAAK,KAAK;YACR,aAAa,GAAG,CAAC,MAAM,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM;QACR,qBAAqB;QACrB;YACE,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;KACxC;IACD,IAAI,OAAO,CAAC,SAAS,EAAE;QACrB,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,aAAa,CACX,IAAI,CAAC,IAAI,CACP,GAAG,OAAO,CAAC,SAAS,EAAE,EACtB,GAAG,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,WAAW,EAAE,IACnC,IAAI,CAAC,QAAQ,EAAE,GAAG,CACpB,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAC7C,EACD,aAAa,CACd,CAAC;KACH;IACD,QAAQ,MAAM,EAAE;QACd,KAAK,SAAS;YACZ,IAAI;gBACF,MAAM,YAAY,CAChB,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,GAAG,EACV,MAAM,CAAC,KAAK,EACZ,aAAa,EACb,MAAM,CAAC,OAAO,CACf,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,QAAQ,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,OAAO,EAAE;oBAC3B,KAAK,qCAAqC;wBACxC,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;wBACnE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAC3C,KAAK,0BAA0B;wBAC7B,OAAO,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;wBACnE,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;oBAC3C;wBACE,OAAO,CAAC,KAAK,CACX,iCAAiC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,IAAI,GAAG,EAC3C,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,CACZ,CAAC;wBACF,MAAM,CAAC,CAAC;iBACX;aACF;YACD,MAAM;QACR,6BAA6B;QAC7B;YACE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;KAC9B;AACH,CAAC;AAED,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;KACzB,OAAO,CACN,2CAA2C,EAC3C,kCAAkC;AAClC,gEAAgE;AAChE,GAAG,EAAE,GAAE,CAAC,EACR,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,KAAK,GAAG,MAAM,SAAS,CAAU;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,QAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ;QACrE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAE,IAAI,CAAC,YAAuB;YAC/B,CAAC,CAAC,MAAM,CAAC,YAAY;QACvB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,IAAI,CAAC,GAAc,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;KACtD,CAAC,CAAC;IACH,MAAM,OAAO,CACX,IAAI,CAAC,MAAgB,EACrB,IAAI,CAAC,MAAgB,EACrB;QACE,IAAI,EAAE,cAAc;QACpB,SAAS,EAAE,IAAI,CAAC,OAAiB;KAClC,EACD,IAAI,aAAa,CACf,IAAI,CAAC,WAAqB,EAC1B,IAAI,CAAC,UAAoB,EACzB,cAAc,EACd,IAAI,CAAC,cAAc;QACjB,CAAC,CAAE,IAAI,CAAC,cAAyB;QACjC,CAAC,CAAC,MAAM,CAAC,cAAc,CAC1B,EACD,KAAK,CACN,CAAC;AACJ,CAAC,CACF;KACA,OAAO,CACN,6CAA6C,EAC7C,oCAAoC;AACpC,gEAAgE;AAChE,GAAG,EAAE,GAAE,CAAC,EACR,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,MAAM,OAAO,GAAG,MAAM,WAAW,CAAU;QACzC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAE,IAAI,CAAC,QAAmB,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ;QACrE,YAAY,EAAE,IAAI,CAAC,YAAY;YAC7B,CAAC,CAAE,IAAI,CAAC,YAAuB;YAC/B,CAAC,CAAC,MAAM,CAAC,YAAY;QACvB,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAE,IAAI,CAAC,GAAc,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG;KACtD,CAAC,CAAC;IACH,MAAM,OAAO,CACX,IAAI,CAAC,MAAgB,EACrB,IAAI,CAAC,MAAgB,EACrB;QACE,IAAI,EAAE,gBAAgB;QACtB,SAAS,EAAE,IAAI,CAAC,OAAiB;KAClC,EACD,IAAI,aAAa,CACf,IAAI,CAAC,WAAqB,EAC1B,IAAI,CAAC,UAAoB,EACzB,gBAAgB,EAChB,IAAI,CAAC,cAAc;QACjB,CAAC,CAAE,IAAI,CAAC,cAAyB;QACjC,CAAC,CAAC,MAAM,CAAC,cAAc,CAC1B,EACD,OAAO,CACR,CAAC;AACJ,CAAC,CACF;KACA,MAAM,CAAC,QAAQ,EAAE;IAChB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,MAAM;IACf,WAAW,EAAE,8BAA8B;CAC5C,CAAC;KACD,MAAM,CAAC,QAAQ,EAAE;IAChB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,QAAQ;IACjB,WAAW,EAAE,gBAAgB;CAC9B,CAAC;KACD,MAAM,CAAC,aAAa,EAAE;IACrB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,WAAW,EAAE,cAAc;CAC5B,CAAC;KACD,MAAM,CAAC,gBAAgB,EAAE;IACxB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,iBAAiB;CAC/B,CAAC;KACD,MAAM,CAAC,YAAY,EAAE;IACpB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,aAAa;CAC3B,CAAC;KACD,MAAM,CAAC,SAAS,EAAE;IACjB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,mBAAmB;CACjC,CAAC;KACD,KAAK,EAAE,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../cli.ts"],"names":[],"mappings":"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"}

package/e2e/spec/webhooks.js

@@ -49,7 +49,9 @@ test(
         '--output=webhook',
         '--webhookType=teams',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_TEAMS,
-        '--webhookMessage="From Github Actions"'
+        '--webhookMessage="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE || 'From Github Actions') +
+          '"'
       ],
       {
         env: {
@@ -84,7 +86,9 @@ test(
         '--output=webhook',
         '--webhookType=slack',
         '--webhookUrl=' + process.env.WEBHOOK_TESTING_SLACK,
-        '--webhookMessage="From Github Actions"'
+        '--webhookMessage="' +
+          (process.env.WEBHOOK_ADDITIONAL_MESSAGE || 'From Github Actions') +
+          '"'
       ],
       {
         env: {

package/k8s.yaml

@@ -0,0 +1,51 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: test-job
+  namespace: kc-reporter
+spec:
+  suspend: false
+  template:
+    spec:
+      containers:
+      - command:
+        - /bin/sh
+        - -c
+        - |
+          while true; do sleep 30; done;
+        env:
+        - name: CONFIG_FILE
+          value: /app/config.json
+        image: continuoussecuritytooling/keycloak-reporting-cli:0.5.1
+        imagePullPolicy: IfNotPresent
+        name: users
+        resources: {}
+        terminationMessagePath: /dev/termination-log
+        terminationMessagePolicy: File
+        volumeMounts:
+        - mountPath: /app/config.json
+          name: config-file
+          readOnly: true
+          subPath: config.json
+      dnsPolicy: ClusterFirst
+      restartPolicy: OnFailure
+      schedulerName: default-scheduler
+      securityContext: {}
+      terminationGracePeriodSeconds: 30
+      volumes:
+      - name: config-file
+        secret:
+          defaultMode: 420
+          secretName: kc-reporter-test-keycloak-reporter
+status:
+  conditions:
+  - lastProbeTime: "2023-10-07T07:43:08Z"
+    lastTransitionTime: "2023-10-07T07:43:08Z"
+    message: Job has reached the specified backoff limit
+    reason: BackoffLimitExceeded
+    status: "True"
+    type: Failed
+  failed: 1
+  ready: 0
+  startTime: "2023-10-07T07:37:15Z"
+  uncountedTerminatedPods: {}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@continuoussecuritytooling/keycloak-reporter",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Reporting Tools for Keycloak",
   "main": "dist/index.js",
   "bin": {
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/ContinuousSecurityTooling/keycloak-reporter#readme",
   "dependencies": {
     "@json2csv/node": "^7.0.0",
-    "@keycloak/keycloak-admin-client": "^20.0.5",
+    "@keycloak/keycloak-admin-client": "^22.0.0",
     "@slack/webhook": "^6.1.0",
     "ajv": "^8.12.0",
     "install": "^0.13.0",
@@ -37,7 +37,7 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@octokit/rest": "^19.0.11",
+    "@octokit/rest": "^20.0.0",
     "@types/jest": "^29.5.1",
     "@types/node": "^20.1.5",
     "@types/yargs": "^17.0.24",

package/test.values.yaml

@@ -0,0 +1,8 @@
+installCRDs: true
+keycloak:
+  config:
+    clientId: admin-cli
+    clientSecret: PWkJ98Atq36QFP5Z25YXJDWs4tvsGvkI
+    webhookType: teams
+    webhookUrl: https://m13t4mgmt.webhook.office.com/webhookb2/02950819-c8ca-4c83-9751-808d801e8810@09f6f098-3af9-474c-a398-d17786fff1bf/IncomingWebhook/b06222e267a04255aaa32a341acb1749/a4f92b5b-01c7-40a8-91ff-0695e08d76ff
+    webhookMessage: TEST