From 9aa2bef4f0b67f61e7257b2d25cee4d4ea0be6c2 Mon Sep 17 00:00:00 2001 From: Robert Wedd Date: Thu, 16 Dec 2021 20:34:44 +0100 Subject: [PATCH 1/2] Updated GCP GAR module to set non_os_package_support as default to true as well as links Signed-off-by: Robert Wedd --- examples/configure-lacework-gar-integration/README.md | 2 +- examples/default/README.md | 3 ++- examples/default/main.tf | 1 + examples/environment-variables-gar/README.md | 3 ++- examples/environment-variables-gar/main.tf | 1 + examples/existing-service-account-gar/README.md | 3 ++- examples/existing-service-account-gar/main.tf | 1 + variables.tf | 2 +- 8 files changed, 11 insertions(+), 5 deletions(-) diff --git a/examples/configure-lacework-gar-integration/README.md b/examples/configure-lacework-gar-integration/README.md index 1e04ee7..f3fc822 100644 --- a/examples/configure-lacework-gar-integration/README.md +++ b/examples/configure-lacework-gar-integration/README.md @@ -40,4 +40,4 @@ $ terraform init $ GOOGLE_CREDENTIALS=account.json GOOGLE_PROJECT=my-project terraform apply ``` -For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://support.lacework.com/hc/en-us/articles/1500009169561-Integrate-Google-Artifact-Registry) +For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://docs.lacework.com/integrate-google-artifact-registry) diff --git a/examples/default/README.md b/examples/default/README.md index 4c446b4..e9d7406 100644 --- a/examples/default/README.md +++ b/examples/default/README.md @@ -17,9 +17,10 @@ provider "google" {} module "lacework_gar" { source = "lacework/gar/gcp" + non_os_package_support = true version = "~> 0.1" } ``` -For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://support.lacework.com/hc/en-us/articles/1500009169561-Integrate-Google-Artifact-Registry) +For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://docs.lacework.com/integrate-google-artifact-registry) diff --git a/examples/default/main.tf b/examples/default/main.tf index 777c1c0..fbc52e8 100644 --- a/examples/default/main.tf +++ b/examples/default/main.tf @@ -4,4 +4,5 @@ provider "google" {} module "lacework_gar" { source = "../.." + non_os_package_support = true } diff --git a/examples/environment-variables-gar/README.md b/examples/environment-variables-gar/README.md index 7a62e7f..c05c001 100644 --- a/examples/environment-variables-gar/README.md +++ b/examples/environment-variables-gar/README.md @@ -40,7 +40,8 @@ provider "lacework" {} module "lacework_gar" { source = "lacework/gar/gcp" version = "~> 0.1" + non_os_package_support = true } ``` -For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://support.lacework.com/hc/en-us/articles/1500009169561-Integrate-Google-Artifact-Registry) +For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://docs.lacework.com/integrate-google-artifact-registry) diff --git a/examples/environment-variables-gar/main.tf b/examples/environment-variables-gar/main.tf index 2efb5f8..3e9f612 100644 --- a/examples/environment-variables-gar/main.tf +++ b/examples/environment-variables-gar/main.tf @@ -27,4 +27,5 @@ provider "lacework" {} module "lacework_gar" { source = "../../" + non_os_package_support = true } diff --git a/examples/existing-service-account-gar/README.md b/examples/existing-service-account-gar/README.md index 72bf1df..c882457 100644 --- a/examples/existing-service-account-gar/README.md +++ b/examples/existing-service-account-gar/README.md @@ -35,6 +35,7 @@ provider "lacework" {} module "lacework_gar" { source = "lacework/gar/gcp" version = "~> 0.1" + non_os_package_support = true use_existing_service_account = true service_account_name = "my-service-account" @@ -48,4 +49,4 @@ $ terraform init $ GOOGLE_CREDENTIALS=account.json GOOGLE_PROJECT=my-project terraform apply ``` -For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://support.lacework.com/hc/en-us/articles/1500009169561-Integrate-Google-Artifact-Registry) +For detailed information on integrating Lacework with Google Artifact Registry see [Integrate Google Artifact Registry](https://docs.lacework.com/integrate-google-artifact-registry) diff --git a/examples/existing-service-account-gar/main.tf b/examples/existing-service-account-gar/main.tf index a895db6..497d3fc 100644 --- a/examples/existing-service-account-gar/main.tf +++ b/examples/existing-service-account-gar/main.tf @@ -4,6 +4,7 @@ provider "lacework" {} module "lacework_gar" { source = "../../" + non_os_package_support = true # Provide an existing service account use_existing_service_account = true diff --git a/variables.tf b/variables.tf index d5a6a6f..d277fea 100644 --- a/variables.tf +++ b/variables.tf @@ -82,6 +82,6 @@ variable "limit_num_imgs" { variable "non_os_package_support" { type = bool - default = false + default = true description = "Whether or not the integration should check non-os packages in the container for vulnerabilities" } From a76b6eca86050d45aab8b03993376bafe3c64875 Mon Sep 17 00:00:00 2001 From: Salim Afiune Date: Wed, 9 Mar 2022 14:38:42 -0800 Subject: [PATCH 2/2] chore: apply suggestions from code review --- examples/default/README.md | 1 - examples/default/main.tf | 1 - examples/environment-variables-gar/README.md | 1 - examples/environment-variables-gar/main.tf | 1 - examples/existing-service-account-gar/README.md | 1 - examples/existing-service-account-gar/main.tf | 1 - 6 files changed, 6 deletions(-) diff --git a/examples/default/README.md b/examples/default/README.md index e9d7406..a11975a 100644 --- a/examples/default/README.md +++ b/examples/default/README.md @@ -17,7 +17,6 @@ provider "google" {} module "lacework_gar" { source = "lacework/gar/gcp" - non_os_package_support = true version = "~> 0.1" } ``` diff --git a/examples/default/main.tf b/examples/default/main.tf index fbc52e8..777c1c0 100644 --- a/examples/default/main.tf +++ b/examples/default/main.tf @@ -4,5 +4,4 @@ provider "google" {} module "lacework_gar" { source = "../.." - non_os_package_support = true } diff --git a/examples/environment-variables-gar/README.md b/examples/environment-variables-gar/README.md index c05c001..895cb1f 100644 --- a/examples/environment-variables-gar/README.md +++ b/examples/environment-variables-gar/README.md @@ -40,7 +40,6 @@ provider "lacework" {} module "lacework_gar" { source = "lacework/gar/gcp" version = "~> 0.1" - non_os_package_support = true } ``` diff --git a/examples/environment-variables-gar/main.tf b/examples/environment-variables-gar/main.tf index 3e9f612..2efb5f8 100644 --- a/examples/environment-variables-gar/main.tf +++ b/examples/environment-variables-gar/main.tf @@ -27,5 +27,4 @@ provider "lacework" {} module "lacework_gar" { source = "../../" - non_os_package_support = true } diff --git a/examples/existing-service-account-gar/README.md b/examples/existing-service-account-gar/README.md index c882457..37f6ce2 100644 --- a/examples/existing-service-account-gar/README.md +++ b/examples/existing-service-account-gar/README.md @@ -35,7 +35,6 @@ provider "lacework" {} module "lacework_gar" { source = "lacework/gar/gcp" version = "~> 0.1" - non_os_package_support = true use_existing_service_account = true service_account_name = "my-service-account" diff --git a/examples/existing-service-account-gar/main.tf b/examples/existing-service-account-gar/main.tf index 497d3fc..a895db6 100644 --- a/examples/existing-service-account-gar/main.tf +++ b/examples/existing-service-account-gar/main.tf @@ -4,7 +4,6 @@ provider "lacework" {} module "lacework_gar" { source = "../../" - non_os_package_support = true # Provide an existing service account use_existing_service_account = true