Skip to content

Commit

Permalink
Fixed accesscontextmanager spec requirements (GoogleCloudPlatform#7952)
Browse files Browse the repository at this point in the history
* fixed accesscontextmanager spec requirements

fixes hashicorp/terraform-provider-google#14612

* fixed google_access_context_manager_service_perimeter as well
  • Loading branch information
alx13 authored and ericayyliu committed Jul 26, 2023
1 parent c4a245b commit c4c1c9f
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions mmv1/products/accesscontextmanager/ServicePerimeter.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -419,9 +419,9 @@ properties:
Currently only projects are allowed.
Format: projects/{project_number}
at_least_one_of:
- status.0.resources
- status.0.access_levels
- status.0.restricted_services
- spec.0.resources
- spec.0.access_levels
- spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::Array
name: 'accessLevels'
Expand All @@ -437,9 +437,9 @@ properties:
Format: accessPolicies/{policy_id}/accessLevels/{access_level_name}
at_least_one_of:
- status.0.resources
- status.0.access_levels
- status.0.restricted_services
- spec.0.resources
- spec.0.access_levels
- spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::Array
name: 'restrictedServices'
Expand All @@ -450,9 +450,9 @@ properties:
buckets inside the perimeter must meet the perimeter's access
restrictions.
at_least_one_of:
- status.0.resources
- status.0.access_levels
- status.0.restricted_services
- spec.0.resources
- spec.0.access_levels
- spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::NestedObject
name: 'vpcAccessibleServices'
Expand Down
18 changes: 9 additions & 9 deletions mmv1/products/accesscontextmanager/ServicePerimeters.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,9 @@ properties:
# TODO: (mbang) won't work for arrays yet, uncomment here once they are supported.
# (github.com/hashicorp/terraform-plugin-sdk/issues/470)
# at_least_one_of:
# - status.0.resources
# - status.0.access_levels
# - status.0.restricted_services
# - spec.0.resources
# - spec.0.access_levels
# - spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::Array
name: 'accessLevels'
Expand All @@ -421,9 +421,9 @@ properties:
# TODO: (mbang) won't work for arrays yet, uncomment here once they are supported.
# (github.com/hashicorp/terraform-plugin-sdk/issues/470)
# at_least_one_of:
# - status.0.resources
# - status.0.access_levels
# - status.0.restricted_services
# - spec.0.resources
# - spec.0.access_levels
# - spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::Array
name: 'restrictedServices'
Expand All @@ -436,9 +436,9 @@ properties:
# TODO: (mbang) won't work for arrays yet, uncomment here once they are supported.
# (github.com/hashicorp/terraform-plugin-sdk/issues/470)
# at_least_one_of:
# - status.0.resources
# - status.0.access_levels
# - status.0.restricted_services
# - spec.0.resources
# - spec.0.access_levels
# - spec.0.restricted_services
item_type: Api::Type::String
- !ruby/object:Api::Type::NestedObject
name: 'vpcAccessibleServices'
Expand Down

0 comments on commit c4c1c9f

Please sign in to comment.