Revert "chore: new release (#58)" (#60)

This reverts commit 8f918c0.
snyk · Dec 19, 2024 · 048d3f5 · 048d3f5
1 parent 8f918c0
commit 048d3f5
Show file tree

Hide file tree

Showing 7 changed files with 226 additions and 529 deletions.
diff --git a/README.md b/README.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -6,16 +6,15 @@
     "scripts": {
         "release": "semantic-release"
     },
+    "dependencies": {
+        "semantic-release": "^24.2.0"
+    },
     "devDependencies": {
-        "@semantic-release/changelog": "^6.0.0",
+        "@semantic-release/changelog": "^6.0.0", 
         "@semantic-release/commit-analyzer": "^9.0.0",
-        "@semantic-release/exec": "^6.0.0",
-        "@semantic-release/github": "^8.0.0",
         "@semantic-release/release-notes-generator": "^14.0.0",
-        "semantic-release": "^24.2.0"
-    },
-    "overrides": {
-        "cross-spawn": "^7.0.5"
+        "@semantic-release/github": "^8.0.0",
+        "@semantic-release/exec": "^6.0.0"
     },
     "lockfileVersion": 3
 }
diff --git a/snyk-universal-broker/templates/ca-secret.yaml b/snyk-universal-broker/templates/ca-secret.yaml
@@ -6,5 +6,5 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels: {{- include "common.labels.standard" ( dict "customLabels" .Values.commonLabels "context" $ ) | nindent 4 }}
 data:
-  {{ .Values.caCertMount.name }}: {{ .Values.caCert | b64enc | nindent 4 }}
+  caCert: {{ .Values.caCert | b64enc | nindent 4 }}
 {{- end }}
diff --git a/snyk-universal-broker/templates/statefulset.yaml b/snyk-universal-broker/templates/statefulset.yaml
@@ -119,7 +119,7 @@ spec:
           volumeMounts:
               {{- if or .Values.caCert .Values.caCertSecret.name }}
               - name: {{ .Release.Name }}-cacert-volume
-                mountPath: {{ .Values.caCertMount.path }}
+                mountPath: {{ printf "%s/%s" .Values.caCertMount.path .Values.caCertMount.name }}
                 readOnly: true
               {{- end }}
               {{- if or .Values.localWebServerSecret.name ( and (.Values.localWebServer.certificate) (.Values.localWebServer.key) ) }}
@@ -168,7 +168,7 @@ spec:
               value: /home/node/tls-cert/tls.key
           {{- end }}
           {{- end }}
-        {{- if .Values.disableAllCertificateTrust }}
+        {{- if or (and .Values.tlsRejectUnauthorized (not .Values.caCert)) (and .Values.caCert .Values.disableAllCertificateTrust) }}
          # Troubleshooting - Set to 0 for SSL inspection testing
             - name: NODE_TLS_REJECT_UNAUTHORIZED
               value: "0"

diff --git a/snyk-universal-broker/tests/certificate_trust_test.yaml b/snyk-universal-broker/tests/certificate_trust_test.yaml
@@ -15,26 +15,26 @@ tests:
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
-          content:
+          content: 
             name: CA_CERT
             value: /home/node/cacert/cacert
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.volumes
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            secret:
+            secret: 
               secretName: RELEASE-NAME-cacert-secret
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.containers[0].volumeMounts
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            mountPath: /home/node/cacert
+            mountPath: /home/node/cacert/cacert 
             readOnly: true
         template: statefulset.yaml
       - equal:
-          path: data.cacert
+          path: data.caCert
           value: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkZBS0UKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
         template: ca-secret.yaml
 
@@ -44,26 +44,26 @@ tests:
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
-          content:
+          content: 
             name: CA_CERT
             value: /home/node/cacert/cacert
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.volumes
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            secret:
+            secret: 
               secretName: RELEASE-NAME-cacert-secret
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.containers[0].volumeMounts
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            mountPath: /home/node/cacert
+            mountPath: /home/node/cacert/cacert 
             readOnly: true
         template: statefulset.yaml
       - equal:
-          path: data.cacert
+          path: data.caCert
           value: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkZBS0UKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQoKLS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkFOT1RIRVIKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ==
         template: ca-secret.yaml
 
@@ -80,35 +80,24 @@ tests:
     asserts:
       - contains:
           path: spec.template.spec.containers[0].env
-          content:
+          content: 
             name: CA_CERT
             value: /home/node/cacert/cacert
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.volumes
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            secret:
+            secret: 
               secretName: corp-ca
               items:
               - key: ca.pem
                 path: cacert
         template: statefulset.yaml
       - contains:
           path: spec.template.spec.containers[0].volumeMounts
-          content:
+          content: 
             name: RELEASE-NAME-cacert-volume
-            mountPath: /home/node/cacert
+            mountPath: /home/node/cacert/cacert
             readOnly: true
         template: statefulset.yaml
-
-  - it: disables all CA trust
-    set:
-      disableAllCertificateTrust: true
-    asserts:
-    - contains:
-        path: spec.template.spec.containers[0].env
-        content:
-          name: NODE_TLS_REJECT_UNAUTHORIZED
-          value: "0"
-      template: statefulset.yaml