From 221516e77adb26d4e20a227785f750bccc882daf Mon Sep 17 00:00:00 2001 From: "Stephen Lewis (Burrows)" Date: Fri, 11 Sep 2026 09:45:59 -0700 Subject: [PATCH] =?UTF-8?q?Revert=20"parametermanager:=20add=20data=5Fcrc3?= =?UTF-8?q?2c=20to=20google=5Fparameter=5Fmanager=5Fparamet=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b2513d581cd4f843fcb1cf733a4ecd62bbbbe6d6. --- .../parametermanager/ParameterVersion.yaml | 16 ------ .../parameter_version_parameter_data.go.tmpl | 3 -- ...parameter_version_with_data_crc32c.tf.tmpl | 10 ---- ...arameter_manager_parameter_version_test.go | 54 +------------------ 4 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 mmv1/templates/terraform/samples/services/parametermanager/parameter_version_with_data_crc32c.tf.tmpl diff --git a/mmv1/products/parametermanager/ParameterVersion.yaml b/mmv1/products/parametermanager/ParameterVersion.yaml index 8f2b5e296cf9..e2bdf7983521 100644 --- a/mmv1/products/parametermanager/ParameterVersion.yaml +++ b/mmv1/products/parametermanager/ParameterVersion.yaml @@ -103,16 +103,6 @@ samples: data: '"./test-fixtures/parameter_data_yaml_format.yaml"' # for backward compatible parameter_id: '"parameter" + randomSuffix' - - name: parameter_version_with_data_crc32c - primary_resource_id: parameter-version-with-data-crc32c - steps: - - name: parameter_version_with_data_crc32c - resource_id_vars: - parameter_id: parameter - parameter_version_id: parameter_version - test_vars_overrides: - # for backward compatible - parameter_id: '"parameter" + randomSuffix' parameters: - name: parameter type: ResourceRef @@ -169,12 +159,6 @@ properties: immutable: true sensitive: true custom_expand: templates/terraform/custom_expand/base64.go.tmpl - - name: dataCrc32c - type: String - description: | - The integrity checksum of the payload. - immutable: true - default_from_api: true - name: kmsKeyVersion type: String output: true diff --git a/mmv1/templates/terraform/custom_flatten/parameter_version_parameter_data.go.tmpl b/mmv1/templates/terraform/custom_flatten/parameter_version_parameter_data.go.tmpl index aa80718e5d14..4b4687cc41be 100644 --- a/mmv1/templates/terraform/custom_flatten/parameter_version_parameter_data.go.tmpl +++ b/mmv1/templates/terraform/custom_flatten/parameter_version_parameter_data.go.tmpl @@ -24,8 +24,5 @@ func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.Reso return err } transformed["parameter_data"] = string(data) - if val, ok := original["dataCrc32c"]; ok && val != nil { - transformed["data_crc32c"] = fmt.Sprintf("%v", val) - } return []interface{}{transformed} } diff --git a/mmv1/templates/terraform/samples/services/parametermanager/parameter_version_with_data_crc32c.tf.tmpl b/mmv1/templates/terraform/samples/services/parametermanager/parameter_version_with_data_crc32c.tf.tmpl deleted file mode 100644 index 0246f19ec16e..000000000000 --- a/mmv1/templates/terraform/samples/services/parametermanager/parameter_version_with_data_crc32c.tf.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -resource "google_parameter_manager_parameter" "parameter-basic" { - parameter_id = "{{index $.ResourceIdVars "parameter_id"}}" -} - -resource "google_parameter_manager_parameter_version" "{{$.PrimaryResourceId}}" { - parameter = google_parameter_manager_parameter.parameter-basic.id - parameter_version_id = "{{index $.ResourceIdVars "parameter_version_id"}}" - parameter_data = "app-parameter-version-data" - data_crc32c = "3931523681" -} diff --git a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go index aa125c1ba73b..26dedfac0f7d 100644 --- a/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go +++ b/mmv1/third_party/terraform/services/parametermanager/resource_parameter_manager_parameter_version_test.go @@ -22,9 +22,6 @@ func TestAccParameterManagerParameterVersion_update(t *testing.T) { Steps: []resource.TestStep{ { Config: testAccParameterManagerParameterVersion_basic(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_parameter_manager_parameter_version.parameter-version-update", "data_crc32c", "1083866889"), - ), }, { ResourceName: "google_parameter_manager_parameter_version.parameter-version-update", @@ -34,21 +31,15 @@ func TestAccParameterManagerParameterVersion_update(t *testing.T) { }, { Config: testAccParameterManagerParameterVersion_update(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_parameter_manager_parameter_version.parameter-version-update", "data_crc32c", "1083866889"), - ), }, { ResourceName: "google_parameter_manager_parameter_version.parameter-version-update", ImportState: true, ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"parameter", "parameter_version_id", "data_crc32c"}, + ImportStateVerifyIgnore: []string{"parameter", "parameter_version_id"}, }, { Config: testAccParameterManagerParameterVersion_basic(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_parameter_manager_parameter_version.parameter-version-update", "data_crc32c", "1083866889"), - ), }, { ResourceName: "google_parameter_manager_parameter_version.parameter-version-update", @@ -60,34 +51,6 @@ func TestAccParameterManagerParameterVersion_update(t *testing.T) { }) } -func TestAccParameterManagerParameterVersion_dataCrc32c(t *testing.T) { - t.Parallel() - - context := map[string]interface{}{ - "random_suffix": acctest.RandString(t, 10), - } - - acctest.VcrTest(t, resource.TestCase{ - PreCheck: func() { acctest.AccTestPreCheck(t) }, - ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), - CheckDestroy: testAccCheckParameterManagerParameterVersionDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccParameterManagerParameterVersion_dataCrc32c(context), - Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("google_parameter_manager_parameter_version.parameter-version-crc32c", "data_crc32c", "1083866889"), - ), - }, - { - ResourceName: "google_parameter_manager_parameter_version.parameter-version-crc32c", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"parameter", "parameter_version_id"}, - }, - }, - }) -} - func testAccParameterManagerParameterVersion_basic(context map[string]interface{}) string { return acctest.Nprintf(` resource "google_parameter_manager_parameter" "parameter-update" { @@ -116,18 +79,3 @@ resource "google_parameter_manager_parameter_version" "parameter-version-update" } `, context) } - -func testAccParameterManagerParameterVersion_dataCrc32c(context map[string]interface{}) string { - return acctest.Nprintf(` -resource "google_parameter_manager_parameter" "parameter-crc32c" { - parameter_id = "tf_test_parameter%{random_suffix}" -} - -resource "google_parameter_manager_parameter_version" "parameter-version-crc32c" { - parameter = google_parameter_manager_parameter.parameter-crc32c.id - parameter_version_id = "tf_test_parameter_version%{random_suffix}" - parameter_data = "parameter-version-data" - data_crc32c = "1083866889" -} -`, context) -}