Skip to content

Commit

Permalink
Merge pull request #124 from adevinta/drop-scan-report
Browse files Browse the repository at this point in the history
Remove static report config from vulcan-report-generator
  • Loading branch information
manelmontilla authored Oct 23, 2023
2 parents 4900d73 + 4728272 commit 96b0155
Show file tree
Hide file tree
Showing 6 changed files with 250 additions and 407 deletions.
36 changes: 0 additions & 36 deletions examples/templates/aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1050,14 +1050,10 @@ spec:
value: "http://myrelease-vulcan-scanengine/v1/"
- name: SCHEDULER_URL
value: "http://myrelease-vulcan-crontinuous/"
- name: SQS_QUEUE_ARN
value: "arn:aws:sqs:eu-west-1:000000000000:APIScans"
- name: REPORTS_SNS_ARN
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
Expand Down Expand Up @@ -1762,38 +1758,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"

Expand Down
41 changes: 1 addition & 40 deletions examples/templates/local.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ data:
VisibilityTimeout: 14400
ReceiveMessageWaitTimeSeconds: 0
Queues:
- Name: VulcanK8SAPIScans
- Name: VulcanK8SMetricsChecks
- Name: VulcanK8SMetricsFindings
- Name: VulcanK8SMetricsScans
Expand All @@ -500,8 +499,6 @@ data:
Raw: false
- Name: VulcanK8SScans
Subscriptions:
- QueueName: VulcanK8SAPIScans
Raw: false
- QueueName: VulcanK8SMetricsScans
Raw: false
- Name: VulcanK8SReportsGen
Expand Down Expand Up @@ -1489,14 +1486,10 @@ spec:
value: "http://myrelease-vulcan-scanengine/v1/"
- name: SCHEDULER_URL
value: "http://myrelease-vulcan-crontinuous/"
- name: SQS_QUEUE_ARN
value: "arn:aws:sqs:local:012345678900:VulcanK8SAPIScans"
- name: REPORTS_SNS_ARN
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
Expand Down Expand Up @@ -1715,7 +1708,7 @@ spec:
app.kubernetes.io/instance: vulcan
app.kubernetes.io/name: goaws
annotations:
checksum/config: f66262dad64e014c95dfaa48d6fbf34ce0e55d18568e6af33f87981acbafbbf4
checksum/config: 91280277b3911db6b6142a3bb962f821a31a7800b116b4071d53694717d2c7dc
spec:
containers:
- name: goaws
Expand Down Expand Up @@ -2265,38 +2258,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:

Expand Down
Loading

0 comments on commit 96b0155

Please sign in to comment.