Skip to content

Commit f9b9dba

Browse files
authored
Revert "Etag support for ACM service perimeters (GoogleCloudPlatform#12363)"
This reverts commit 161220a.
1 parent d7d5bdf commit f9b9dba

File tree

5 files changed

+0
-26
lines changed

5 files changed

+0
-26
lines changed

mmv1/products/accesscontextmanager/ServicePerimeter.yaml

-8
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ async:
6565
custom_code:
6666
constants: 'templates/terraform/constants/access_context_manager.go.tmpl'
6767
encoder: 'templates/terraform/encoders/access_level_never_send_parent.go.tmpl'
68-
pre_update: 'templates/terraform/pre_update/access_context_manager_service_perimeter.go.tmpl'
6968
custom_import: 'templates/terraform/custom_import/set_access_policy_parent_from_self_link.go.tmpl'
7069
# Skipping the sweeper due to the non-standard base_url
7170
exclude_sweeper: true
@@ -783,10 +782,3 @@ properties:
783782
actually enforcing them. This testing is done through analyzing the differences
784783
between currently enforced and suggested restrictions. useExplicitDryRunSpec must
785784
bet set to True if any of the fields in the spec are set to non-default values.
786-
- name: 'etag'
787-
type: Fingerprint
788-
description: |
789-
An opaque identifier for the current version of the ServicePerimeter. This
790-
identifier does not follow any specific format. If an etag is not provided, the
791-
operation will be performed as if a valid etag is provided.
792-
output: true

mmv1/products/accesscontextmanager/ServicePerimeters.yaml

-7
Original file line numberDiff line numberDiff line change
@@ -94,13 +94,6 @@ properties:
9494
description: |
9595
Description of the ServicePerimeter and its use. Does not affect
9696
behavior.
97-
- name: 'etag'
98-
type: Fingerprint
99-
description: |
100-
An opaque identifier for the current version of the ServicePerimeter. This
101-
identifier does not follow any specific format. If an etag is not provided, the
102-
operation will be performed as if a valid etag is provided.
103-
output: true
10497
- name: 'createTime'
10598
type: Time
10699
description: |

mmv1/templates/terraform/custom_flatten/accesscontextmanager_serviceperimeters_custom_flatten.go.tmpl

-5
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.Reso
1818
"perimeter_type": flattenAccessContextManagerServicePerimetersServicePerimetersPerimeterType(original["perimeterType"], d, config),
1919
"status": flattenAccessContextManagerServicePerimetersServicePerimetersStatus(original["status"], d, config),
2020
"spec": flattenAccessContextManagerServicePerimetersServicePerimetersSpec(original["spec"], d, config),
21-
"etag": flattenAccessContextManagerServicePerimetersServicePerimetersEtag(original["etag"], d, config),
2221
"use_explicit_dry_run_spec": flattenAccessContextManagerServicePerimetersServicePerimetersUseExplicitDryRunSpec(original["useExplicitDryRunSpec"], d, config),
2322
})
2423
}
@@ -39,10 +38,6 @@ func flattenAccessContextManagerServicePerimetersServicePerimetersName(v interfa
3938
return v
4039
}
4140

42-
func flattenAccessContextManagerServicePerimetersServicePerimetersEtag(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
43-
return v
44-
}
45-
4641
func flattenAccessContextManagerServicePerimetersServicePerimetersTitle(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
4742
return v
4843
}

mmv1/templates/terraform/pre_update/access_context_manager_service_perimeter.go.tmpl

-5
This file was deleted.

mmv1/third_party/terraform/services/accesscontextmanager/resource_access_context_manager_service_perimeter_test.go.tmpl

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ func testAccAccessContextManagerServicePerimeter_basicTest(t *testing.T) {
2626
Steps: []resource.TestStep{
2727
{
2828
Config: testAccAccessContextManagerServicePerimeter_basic(org, "my policy", "level", "perimeter"),
29-
Check: resource.TestCheckResourceAttrSet("google_access_context_manager_service_perimeter.test-access", "etag"),
3029
},
3130
{
3231
ResourceName: "google_access_context_manager_service_perimeter.test-access",

0 commit comments

Comments
 (0)