Remove static report config from vulcan-report-generator

adevinta · Oct 3, 2023 · d3ca0e8 · d3ca0e8
1 parent a1d67a6
commit d3ca0e8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 128 deletions.
diff --git a/examples/templates/aws.yaml b/examples/templates/aws.yaml
@@ -1056,8 +1056,6 @@ spec:
             value: "arn:aws:sns:eu-west-1:000000000000:ReportsGen"
           - name: REPORTS_API_URL
             value: "http://myrelease-vulcan-reportsgenerator/"
-          - name: SCAN_REDIRECT_URL
-            value: 
           - name: VULCAN_UI_URL
             value: "https://www.vulcan.example.com"
           - name: PERSISTENCE_HOST
@@ -1745,38 +1743,6 @@ spec:
             value: "[email protected]"
           - name: SES_CC
             value: "['[email protected]']"
-          - name: SCAN_EMAIL_SUBJECT
-            value: "Security Overview"
-          - name: SCAN_S3_PUBLIC_BUCKET
-            value: "s3-vulcan-public-insights"
-          - name: SCAN_S3_PRIVATE_BUCKET
-            value: "s3-vulcan-insights"
-          - name: SCAN_GA_ID
-            value: "UA-109338366-3"
-          - name: SCAN_COMPANY_NAME
-            value: "Example"
-          - name: SCAN_SUPPORT_EMAIL
-            value: "[email protected]"
-          - name: SCAN_CONTACT_EMAIL
-            value: "[email protected]"
-          - name: SCAN_CONTACT_CHANNEL
-            value: "https://www.slack.com/archives/XXXXX"
-          - name: SCAN_CONTACT_JIRA
-            value: "https://jira.com/"
-          - name: SCAN_DOCS_API_LINK
-            value: "https://www.domain.com/org/vulcan-api/examples/#how-do-i-list-the-members-of-a-team"
-          - name: SCAN_DOCS_ROADMAP_LINK
-            value: "https://docs.google.com/spreadsheets/d/xxxxxxxxxxxxxxx/edit?usp=sharing"
-          - name: PERSISTENCE_ENDPOINT  # We keep this PERSISTENCE variable for compatibility
-            value: "http://myrelease-vulcan-scanengine"
-          - name: RESULTS_ENDPOINT
-            value: "http://myrelease-vulcan-results"
-          - name: SCAN_PROXY_ENDPOINT
-            value: "https://insights.vulcan.example.com"
-          - name: VULCAN_UI
-            value: "https://www.vulcan.example.com/"
-          - name: SCAN_VIEW_REPORT
-            value: "https://www.vulcan.example.com/api/v1/report?team_id=%s&scan_id=%s"
           - name: LIVEREPORT_EMAIL_SUBJECT
             value: "Vulcan Digest"
 

diff --git a/examples/templates/local.yaml b/examples/templates/local.yaml
@@ -1495,8 +1495,6 @@ spec:
             value: "arn:aws:sns:local:012345678900:VulcanK8SReportsGen"
           - name: REPORTS_API_URL
             value: "http://myrelease-vulcan-reportsgenerator/"
-          - name: SCAN_REDIRECT_URL
-            value: 
           - name: VULCAN_UI_URL
             value: 
           - name: PERSISTENCE_HOST
@@ -2249,38 +2247,6 @@ spec:
             value: "[email protected]"
           - name: SES_CC
             value: "[\"[email protected]\"]"
-          - name: SCAN_EMAIL_SUBJECT
-            value: "Security Overview"
-          - name: SCAN_S3_PUBLIC_BUCKET
-            value: "public-insights"
-          - name: SCAN_S3_PRIVATE_BUCKET
-            value: "insights"
-          - name: SCAN_GA_ID
-            value: "UA-000000000-0"
-          - name: SCAN_COMPANY_NAME
-            value: "Example"
-          - name: SCAN_SUPPORT_EMAIL
-            value: "[email protected]"
-          - name: SCAN_CONTACT_EMAIL
-            value: "[email protected]"
-          - name: SCAN_CONTACT_CHANNEL
-            value: "https://example.slack.com/archives/XXXXX"
-          - name: SCAN_CONTACT_JIRA
-            value: "https://jira.example.com/"
-          - name: SCAN_DOCS_API_LINK
-            value: "https://docs.example.com/vulcan/vulcan-api/examples/#how-do-i-list-the-members-of-a-team"
-          - name: SCAN_DOCS_ROADMAP_LINK
-            value: "https://docs.example.com/vulcan/roadmap"
-          - name: PERSISTENCE_ENDPOINT  # We keep this PERSISTENCE variable for compatibility
-            value: "http://myrelease-vulcan-scanengine"
-          - name: RESULTS_ENDPOINT
-            value: "http://myrelease-vulcan-results"
-          - name: SCAN_PROXY_ENDPOINT
-            value: "http://insights.vulcan.local"
-          - name: VULCAN_UI
-            value: "http://www.vulcan.local/"
-          - name: SCAN_VIEW_REPORT
-            value: "http://www.vulcan.local/api/v1/report?team_id=%s&scan_id=%s"
           - name: LIVEREPORT_EMAIL_SUBJECT
             value: 
 

diff --git a/stable/vulcan/templates/api/deployment.yaml b/stable/vulcan/templates/api/deployment.yaml
@@ -62,14 +62,10 @@ spec:
             value: {{ .Values.comp.conf.scanengineUrl | default ( printf "%s/v1/" (include "scanengine.url" .) ) | quote }}
           - name: SCHEDULER_URL
             value: {{ .Values.comp.conf.schedulerUrl | default (include "crontinuous.url" .) | quote }}
-          - name: SQS_QUEUE_ARN
-            value: {{ .Values.comp.conf.queueArn | quote }}
           - name: REPORTS_SNS_ARN
             value: {{ .Values.comp.conf.reports.snsArn | quote }}
           - name: REPORTS_API_URL
             value: {{ .Values.comp.conf.reports.apiUrl | default (include "reportsgenerator.url" .) | quote }}
-          - name: SCAN_REDIRECT_URL
-            value: {{ .Values.comp.conf.reports.redirectUrl | quote }}
           - name: VULCAN_UI_URL
             value: {{ .Values.comp.conf.reports.vulcanUIUrl | quote }}
           - name: PERSISTENCE_HOST

diff --git a/stable/vulcan/templates/reportsgenerator/deployment.yaml b/stable/vulcan/templates/reportsgenerator/deployment.yaml
@@ -58,42 +58,6 @@ spec:
             value: {{ .Values.comp.conf.ses.from | quote }}
           - name: SES_CC
             value: {{ .Values.comp.conf.ses.cc | quote }}
-          - name: SCAN_EMAIL_SUBJECT
-            value: {{ .Values.comp.conf.generators.scan.emailSubject | quote }}
-          - name: SCAN_S3_PUBLIC_BUCKET
-            value: {{ .Values.comp.conf.generators.scan.publicBucket | quote }}
-          - name: SCAN_S3_PRIVATE_BUCKET
-            value: {{ .Values.comp.conf.generators.scan.privateBucket | quote }}
-          - name: SCAN_GA_ID
-            value: {{ .Values.comp.conf.generators.scan.gaId | quote }}
-          - name: SCAN_COMPANY_NAME
-            value: {{ .Values.comp.conf.generators.scan.contact.companyName | quote }}
-          - name: SCAN_SUPPORT_EMAIL
-            value: {{ .Values.comp.conf.generators.scan.contact.supportEmail | quote }}
-          - name: SCAN_CONTACT_EMAIL
-            value: {{ .Values.comp.conf.generators.scan.contact.email | quote }}
-          - name: SCAN_CONTACT_CHANNEL
-            value: {{ .Values.comp.conf.generators.scan.contact.slackChannel | quote }}
-          - name: SCAN_CONTACT_JIRA
-            value: {{ .Values.comp.conf.generators.scan.contact.jira | quote }}
-          - name: SCAN_DOCS_API_LINK
-            value: {{ .Values.comp.conf.generators.scan.docs.apiDocLink | quote }}
-          - name: SCAN_DOCS_ROADMAP_LINK
-            value: {{ .Values.comp.conf.generators.scan.docs.roadmapLink | quote }}
-          - name: PERSISTENCE_ENDPOINT  # We keep this PERSISTENCE variable for compatibility
-            value: {{ .Values.comp.conf.scanengineUrl | default (include "scanengine.url" .) | quote }}
-          - name: RESULTS_ENDPOINT
-            value: {{ .Values.comp.conf.resultsUrl | default (include "results.url" .) | quote }}
-          - name: SCAN_PROXY_ENDPOINT
-            value: {{ .Values.comp.conf.generators.scan.proxyEndpoint | quote }}
-          - name: VULCAN_UI
-            value: {{ .Values.comp.conf.generators.scan.vulcanUi | quote }}
-          - name: SCAN_VIEW_REPORT
-            value: {{ printf "%sapi/v1/report?team_id=%s&scan_id=%s" .Values.comp.conf.generators.scan.vulcanUi "%s" "%s" | quote }}
-          {{- if .Values.comp.conf.generators.scan.redirectUrl }}
-          - name: SCAN_REDIRECT_URL
-            value: {{ .Values.comp.conf.generators.scan.redirectUrl | quote }}
-          {{- end }}
           - name: LIVEREPORT_EMAIL_SUBJECT
             value: {{ .Values.comp.conf.generators.livereport.emailSubject | quote }}
         {{- include "common-container-envs" . | nindent 10 }}

diff --git a/stable/vulcan/values.yaml b/stable/vulcan/values.yaml
@@ -376,11 +376,9 @@ api:
     bucketLogs: logs
     s3PrivateBucket: insights
     s3PublicBucket: public-insights
-    queueArn: arn:aws:sqs:local:012345678900:VulcanK8SAPIScans
     queueName: VulcanK8SAPIScans
     reports:
       snsArn: arn:aws:sns:local:012345678900:VulcanK8SReportsGen
-      redirectUrl:
       vulcanUIUrl:
     secretKey: TBDTBD
     cookieDomain:     # default .Values.global.domain
@@ -591,24 +589,6 @@ reportsgenerator:
     scanengineUrl:
     resultsUrl:
     generators:
-      scan:
-        emailSubject: "Security Overview"
-        publicBucket: public-insights
-        privateBucket: insights
-        gaId: UA-000000000-0
-        proxyEndpoint:     # https://vulcan-insights
-        contact:
-          companyName: Example
-          email: [email protected]
-          jira: https://jira.example.com/
-          slackChannel: https://example.slack.com/archives/XXXXX
-          supportEmail: [email protected]
-        docs:
-          apiDocLink: https://docs.example.com/vulcan/vulcan-api/examples/#how-do-i-list-the-members-of-a-team
-          roadmapLink: https://docs.example.com/vulcan/roadmap
-        vulcanUi:     # https://vulcan-www
-        viewReport:   # vulcan-api/api/v1/report?team_id=%s&scan_id=%s
-        redirectUrl:  # https://public-redirect/index.html?reportUrl=
       livereport:
         emailSubject:   # Vulcan Digest
     ses: