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

ACM: service perimeter's vpc_accessible_services #3318

Merged
merged 1 commit into from
Mar 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions products/accesscontextmanager/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,23 @@ objects:
- status.0.access_levels
- status.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::NestedObject
name: 'vpcAccessibleServices'
description: |
Specifies how APIs are allowed to communicate within the Service
Perimeter.
properties:
- !ruby/object:Api::Type::Boolean
name: 'enableRestriction'
description: |
Whether to restrict API calls within the Service Perimeter to the
list of APIs specified in 'allowedServices'.
- !ruby/object:Api::Type::Array
name: 'allowedServices'
description: |
The list of APIs usable within the Service Perimeter.
Must be empty unless `enableRestriction` is True.
item_type: Api::Type::String
- !ruby/object:Api::Resource
name: 'ServicePerimeterResource'
create_url: "{{perimeter_name}}"
Expand Down
2 changes: 2 additions & 0 deletions products/accesscontextmanager/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
input: true
status.restrictedServices: !ruby/object:Overrides::Terraform::PropertyOverride
is_set: true
status.vpcAccessibleServices.allowedServices: !ruby/object:Overrides::Terraform::PropertyOverride
is_set: true
custom_code: !ruby/object:Provider::Terraform::CustomCode
encoder: templates/terraform/encoders/access_level_never_send_parent.go.erb
custom_import: templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.erb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@ func testAccAccessContextManagerServicePerimeter_updateTest(t *testing.T) {
ImportState: true,
ImportStateVerify: true,
},
{
Config: testAccAccessContextManagerServicePerimeter_updateAllowed(org, "my policy", "level", "perimeter"),
},
{
ResourceName: "google_access_context_manager_service_perimeter.test-access",
ImportState: true,
ImportStateVerify: true,
},
},
})
}
Expand Down Expand Up @@ -145,3 +153,42 @@ resource "google_access_context_manager_service_perimeter" "test-access" {
}
`, org, policyTitle, levelTitleName, levelTitleName, perimeterTitleName, perimeterTitleName)
}

func testAccAccessContextManagerServicePerimeter_updateAllowed(org, policyTitle, levelTitleName, perimeterTitleName string) string {
return fmt.Sprintf(`
resource "google_access_context_manager_access_policy" "test-access" {
parent = "organizations/%s"
title = "%s"
}

resource "google_access_context_manager_access_level" "test-access" {
parent = "accessPolicies/${google_access_context_manager_access_policy.test-access.name}"
name = "accessPolicies/${google_access_context_manager_access_policy.test-access.name}/accessLevels/%s"
title = "%s"
description = "hello"
basic {
combining_function = "AND"
conditions {
ip_subnetworks = ["192.0.4.0/24"]
}
}
}

resource "google_access_context_manager_service_perimeter" "test-access" {
parent = "accessPolicies/${google_access_context_manager_access_policy.test-access.name}"
name = "accessPolicies/${google_access_context_manager_access_policy.test-access.name}/servicePerimeters/%s"
title = "%s"
perimeter_type = "PERIMETER_TYPE_REGULAR"
status {
restricted_services = ["bigquery.googleapis.com"]
access_levels = [google_access_context_manager_access_level.test-access.name]

vpc_accessible_services {
enable_restriction = true
allowed_services = ["bigquery.googleapis.com"]
}
}
}
`, org, policyTitle, levelTitleName, levelTitleName, perimeterTitleName, perimeterTitleName)
}