Merge pull request #117 from snyk/fix/add-bearer-types

fix: add bitbucket-server bearer auth flavor
snyk · May 7, 2024 · 0de3041 · 0de3041
2 parents 44efe7d + 324f7ae
commit 0de3041
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/charts/snyk-broker/Chart.yaml b/charts/snyk-broker/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
 name: snyk-broker
-version: 2.6.6
+version: 2.6.7
 description: A Helm chart for Kubernetes
 type: application
diff --git a/charts/snyk-broker/templates/broker_deployment.yaml b/charts/snyk-broker/templates/broker_deployment.yaml
@@ -188,6 +188,27 @@ spec:
             - name: BROKER_CLIENT_URL
               value: {{ .Values.brokerClientUrl }}
           {{- end }}
+          {{- if eq .Values.scmType "bitbucket-server-bearer-auth" }}
+          # Bitbucket Bearer Auth
+            - name: BROKER_TOKEN
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.scmType}}-broker-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}
+                  key: "{{ .Values.scmType}}-broker-token-key"
+            - name: BITBUCKET_PAT
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}
+                  key: "{{ .Values.scmType}}-token-key"
+            - name: BITBUCKET
+              value: {{ .Values.bitbucket }}
+            - name: BITBUCKET_API
+              value: {{ .Values.bitbucketApi }}
+            - name: PORT
+              value: {{ .Values.deployment.container.containerPort | squote }}
+            - name: BROKER_CLIENT_URL
+              value: {{ .Values.brokerClientUrl }}
+          {{- end }}
           {{- if eq .Values.scmType "gitlab" }}
           # GitLab
             - name: BROKER_TOKEN
@@ -441,7 +462,7 @@ spec:
             - name: ACCEPT
               value: /home/node/private/accept.json
          {{ else }}
-          {{- if or (eq .Values.scmType "github-com") (eq .Values.scmType "github-enterprise") (eq .Values.scmType "bitbucket-server") (eq .Values.scmType "gitlab") (eq .Values.scmType "azure-repos") }}
+          {{- if has .Values.scmType ( list "github-com" "github-enterprise" "bitbucket-server" "bitbucket-server-bearer-auth" "gitlab" "azure-repos") }}
           {{- if not .Values.disableAutoAcceptRules  }}
           # Default Values to allow Snyk Code Snippets and Snyk IaC
             {{- if not .Values.enableSnykCodeLocalEngine }}

diff --git a/charts/snyk-broker/templates/secrets.yaml b/charts/snyk-broker/templates/secrets.yaml
@@ -38,6 +38,16 @@ data:
   "{{ .Values.scmType}}-token-key": {{ .Values.bitbucketPassword | b64enc | quote }}
 ---
 {{- end }}
+{{- if .Values.bitbucketPat }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ .Values.scmType}}-token{{if not .Values.disableSuffixes }}-{{ .Release.Name }}{{ end }}
+type: Opaque
+stringData:
+  "{{ .Values.scmType}}-token-key": {{ .Values.bitbucketPat | quote }}
+---
+{{- end }}
 {{- if .Values.azureReposToken }}
 apiVersion: v1
 kind: Secret