Skip to content

Commit

Permalink
feat(GROW-2928): Upgrade the gcp terraform version (#1637)
Browse files Browse the repository at this point in the history
* feat(GROW-2928): Upgrade the gcp terraform version

Signed-off-by: Lei Jin <lei.jin@lacework.net>

* feat(GROW-2928): Upgrade the gcp terraform version

Signed-off-by: Lei Jin <lei.jin@lacework.net>

---------

Signed-off-by: Lei Jin <lei.jin@lacework.net>
  • Loading branch information
leijin-lw authored Jun 5, 2024
1 parent e575eac commit 02bccca
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion integration/framework_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ func TestMain(m *testing.M) {
func terraformInstall() {
installer := &releases.ExactVersion{
Product: product.Terraform,
Version: version.Must(version.NewVersion("1.4.7")),
Version: version.Must(version.NewVersion("1.5.0")),
}

_execPath, err := installer.Install(context.Background())
Expand Down
4 changes: 2 additions & 2 deletions lwgenerate/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ const (
LWAzureADVersion = "~> 1.0"

GcpAgentlessSource = "lacework/agentless-scanning/gcp"
GcpAgentlessVersion = "~> 0.1"
GcpAgentlessVersion = "~> 2.0"
GcpConfigSource = "lacework/config/gcp"
GcpConfigVersion = "~> 2.3"
GcpConfigVersion = "~> 3.0"
GcpAuditLogSource = "lacework/audit-log/gcp"
GcpAuditLogVersion = "~> 3.4"
GcpGKEAuditLogSource = "lacework/gke-audit-log/gcp"
Expand Down
34 changes: 17 additions & 17 deletions lwgenerate/gcp/gcp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
folders_to_include = ["abc", "def"]
org_integration = true
organization_id = "123456789"
Expand All @@ -583,7 +583,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
folders_to_exclude = ["abc", "def"]
org_integration = true
organization_id = "123456789"
Expand All @@ -601,7 +601,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
org_integration = true
organization_id = "123456789"
}
Expand All @@ -619,7 +619,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
folders_to_exclude = ["abc"]
include_root_projects = false
org_integration = true
Expand All @@ -639,7 +639,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
folders_to_exclude = ["abc"]
org_integration = true
organization_id = "123456789"
Expand All @@ -655,7 +655,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
prefix = "rar"
}
`),
Expand All @@ -669,7 +669,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
wait_time = "30s"
}
`),
Expand All @@ -683,7 +683,7 @@ func TestGenerateGcpTfConfigurationArgs_Generate_Configuration(t *testing.T) {
),
ReqProvider(projectName, `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
for_each = {
project1 = "project1"
Expand Down Expand Up @@ -1126,13 +1126,13 @@ var moduleImportOrganizationLevelPubSubAuditLogCustomIntegrationName = `module "

var moduleImportProjectLevelConfiguration = `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
}
`

var moduleImportProjectLevelConfigurationExistingSA = `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
service_account_name = "foo"
service_account_private_key = "123456789"
use_existing_service_account = true
Expand All @@ -1141,22 +1141,22 @@ var moduleImportProjectLevelConfigurationExistingSA = `module "gcp_project_level

var moduleImportProjectLevelConfigurationCustomIntegrationName = `module "gcp_project_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
lacework_integration_name = "custom_integration_name"
}
`

var moduleImportOrganizationLevelConfiguration = `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
org_integration = true
organization_id = "123456789"
}
`

var moduleImportOrganizationLevelConfigurationExistingSA = `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
org_integration = true
organization_id = "123456789"
service_account_name = "foo"
Expand All @@ -1167,7 +1167,7 @@ var moduleImportOrganizationLevelConfigurationExistingSA = `module "gcp_organiza

var moduleImportOrganizationLevelConfigurationCustomIntegrationName = `module "gcp_organization_level_config" {
source = "lacework/config/gcp"
version = "~> 2.3"
version = "~> 3.0"
lacework_integration_name = "custom_integration_name"
org_integration = true
organization_id = "123456789"
Expand All @@ -1182,7 +1182,7 @@ var moduleImportProjectLevelAgentless = `provider "google" {
module "lacework_gcp_agentless_scanning_global" {
source = "lacework/agentless-scanning/gcp"
version = "~> 0.1"
version = "~> 2.0"
global = true
regional = true
Expand All @@ -1200,7 +1200,7 @@ var moduleImportProjectLevelAgentlessWithProjectFilterList = `provider "google"
module "lacework_gcp_agentless_scanning_global" {
source = "lacework/agentless-scanning/gcp"
version = "~> 0.1"
version = "~> 2.0"
global = true
project_filter_list = ["p1", "p2"]
regional = true
Expand All @@ -1219,7 +1219,7 @@ var moduleImportOrgLevelAgentless = `provider "google" {
module "lacework_gcp_agentless_scanning_global" {
source = "lacework/agentless-scanning/gcp"
version = "~> 0.1"
version = "~> 2.0"
global = true
integration_type = "ORGANIZATION"
organization_id = "123456789"
Expand Down

0 comments on commit 02bccca

Please sign in to comment.