Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set up prerequisites to push logs from core-vpc into core-logging S3 bucket #7749

Merged
merged 1 commit into from
Aug 22, 2024

Conversation

dms1981
Copy link
Contributor

@dms1981 dms1981 commented Aug 22, 2024

A reference to the issue / Description of it

#7607

How does this PR fix the problem?

  • Bumps the VPC module to v2.4.0 which outputs the flow log group name
  • Aligns the secret name better with existing secrets
  • Creates data calls in core-vpc to get the bucket ARN
  • Sets up a local (which needs expanding) to only retrieve log group names in core-vpc-production

How has this been tested?

Tested with a local plan / apply --refresh-only to check the local values

Deployment Plan / Instructions

Deploy through CI

Checklist (check x in [ ] of list items)

  • I have performed a self-review of my own code
  • All checks have passed
  • I have made corresponding changes to the documentation
  • Plan and discussed how it should be deployed to PROD (If needed)

Additional comments (if any)

{Please write here}

@dms1981 dms1981 requested a review from a team as a code owner August 22, 2024 12:41
Copy link
Contributor

Trivy Scan Success

Show Output ```hcl

Trivy will check the following folders:
terraform/environments/core-logging
terraform/environments/core-vpc


Running Trivy in terraform/environments/core-logging
2024-08-22T12:43:07Z INFO [db] Need to update DB
2024-08-22T12:43:07Z INFO [db] Downloading DB... repository="ghcr.io/aquasecurity/trivy-db:2"
2024-08-22T12:43:09Z INFO [vuln] Vulnerability scanning is enabled
2024-08-22T12:43:09Z INFO [misconfig] Misconfiguration scanning is enabled
2024-08-22T12:43:09Z INFO Need to update the built-in policies
2024-08-22T12:43:09Z INFO Downloading the built-in policies...
74.86 KiB / 74.86 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-08-22T12:43:10Z INFO [secret] Secret scanning is enabled
2024-08-22T12:43:10Z INFO [secret] If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-08-22T12:43:10Z INFO [secret] Please see also https://aquasecurity.github.io/trivy/v0.54/docs/scanner/secret#recommendation for faster secret detection
2024-08-22T12:43:14Z INFO Number of language-specific files num=1
2024-08-22T12:43:14Z INFO [gomod] Detecting vulnerabilities...
2024-08-22T12:43:14Z INFO Detected config files num=10
trivy_exitcode=0


Running Trivy in terraform/environments/core-vpc
2024-08-22T12:43:14Z INFO [vuln] Vulnerability scanning is enabled
2024-08-22T12:43:14Z INFO [misconfig] Misconfiguration scanning is enabled
2024-08-22T12:43:14Z INFO [secret] Secret scanning is enabled
2024-08-22T12:43:14Z INFO [secret] If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-08-22T12:43:14Z INFO [secret] Please see also https://aquasecurity.github.io/trivy/v0.54/docs/scanner/secret#recommendation for faster secret detection
2024-08-22T12:43:15Z INFO Number of language-specific files num=0
2024-08-22T12:43:15Z INFO Detected config files num=4
trivy_exitcode=0

</details> #### `Checkov Scan` Success
<details><summary>Show Output</summary>

```hcl

*****************************

Checkov will check the following folders:
terraform/environments/core-logging
terraform/environments/core-vpc

*****************************

Running Checkov in terraform/environments/core-logging
Excluding the following checks: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
2024-08-22 12:43:18,859 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/modernisation-platform-terraform-s3-bucket?ref=8688bc15a08fbf5a4f4eef9b7433c5a417df8df1:None (for external modules, the --download-external-modules flag is required)
2024-08-22 12:43:18,859 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/modernisation-platform-terraform-s3-bucket?ref=cadab519b10a7d28dfa3b77d407725db6b37614a:None (for external modules, the --download-external-modules flag is required)
2024-08-22 12:43:18,859 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/terraform-aws-observability-platform-tenant?ref=fbbe5c8282786bcc0a00c969fe598e14f12eea9b:None (for external modules, the --download-external-modules flag is required)
terraform scan results:

Passed checks: 531, Failed checks: 0, Skipped checks: 197


checkov_exitcode=0

*****************************

Running Checkov in terraform/environments/core-vpc
Excluding the following checks: CKV_GIT_1,CKV_AWS_126,CKV2_AWS_38,CKV2_AWS_39
2024-08-22 12:43:23,098 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/modernisation-platform-terraform-pagerduty-integration?ref=0179859e6fafc567843cd55c0b05d325d5012dc4:None (for external modules, the --download-external-modules flag is required)
2024-08-22 12:43:23,099 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/terraform-aws-observability-platform-tenant?ref=fbbe5c8282786bcc0a00c969fe598e14f12eea9b:None (for external modules, the --download-external-modules flag is required)
2024-08-22 12:43:23,099 [MainThread  ] [WARNI]  Failed to download module github.com/ministryofjustice/modernisation-platform-terraform-member-vpc?ref=3094604aee5121f9794d60d3f27d21d6209e59d4:None (for external modules, the --download-external-modules flag is required)
terraform scan results:

Passed checks: 356, Failed checks: 0, Skipped checks: 147


checkov_exitcode=0

CTFLint Scan Success

Show Output
*****************************

Setting default tflint config...
Running tflint --init...
Installing "terraform" plugin...
Installed "terraform" (source: github.com/terraform-linters/tflint-ruleset-terraform, version: 0.5.0)
tflint will check the following folders:
terraform/environments/core-logging
terraform/environments/core-vpc

*****************************

Running tflint in terraform/environments/core-logging
Excluding the following checks: terraform_unused_declarations
tflint_exitcode=0

*****************************

Running tflint in terraform/environments/core-vpc
Excluding the following checks: terraform_unused_declarations
tflint_exitcode=0

Trivy Scan Success

Show Output
*****************************

Trivy will check the following folders:
terraform/environments/core-logging
terraform/environments/core-vpc

*****************************

Running Trivy in terraform/environments/core-logging
2024-08-22T12:43:07Z	INFO	[db] Need to update DB
2024-08-22T12:43:07Z	INFO	[db] Downloading DB...	repository="ghcr.io/aquasecurity/trivy-db:2"
2024-08-22T12:43:09Z	INFO	[vuln] Vulnerability scanning is enabled
2024-08-22T12:43:09Z	INFO	[misconfig] Misconfiguration scanning is enabled
2024-08-22T12:43:09Z	INFO	Need to update the built-in policies
2024-08-22T12:43:09Z	INFO	Downloading the built-in policies...
74.86 KiB / 74.86 KiB [-----------------------------------------------------------] 100.00% ? p/s 0s2024-08-22T12:43:10Z	INFO	[secret] Secret scanning is enabled
2024-08-22T12:43:10Z	INFO	[secret] If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-08-22T12:43:10Z	INFO	[secret] Please see also https://aquasecurity.github.io/trivy/v0.54/docs/scanner/secret#recommendation for faster secret detection
2024-08-22T12:43:14Z	INFO	Number of language-specific files	num=1
2024-08-22T12:43:14Z	INFO	[gomod] Detecting vulnerabilities...
2024-08-22T12:43:14Z	INFO	Detected config files	num=10
trivy_exitcode=0

*****************************

Running Trivy in terraform/environments/core-vpc
2024-08-22T12:43:14Z	INFO	[vuln] Vulnerability scanning is enabled
2024-08-22T12:43:14Z	INFO	[misconfig] Misconfiguration scanning is enabled
2024-08-22T12:43:14Z	INFO	[secret] Secret scanning is enabled
2024-08-22T12:43:14Z	INFO	[secret] If your scanning is slow, please try '--scanners vuln' to disable secret scanning
2024-08-22T12:43:14Z	INFO	[secret] Please see also https://aquasecurity.github.io/trivy/v0.54/docs/scanner/secret#recommendation for faster secret detection
2024-08-22T12:43:15Z	INFO	Number of language-specific files	num=0
2024-08-22T12:43:15Z	INFO	Detected config files	num=4
trivy_exitcode=0

@dms1981 dms1981 added this pull request to the merge queue Aug 22, 2024
Merged via the queue into main with commit 5a2fe9a Aug 22, 2024
13 checks passed
@dms1981 dms1981 deleted the feature/7607-set-up-prereqs-in-core-vpc branch August 22, 2024 12:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants