publicca: fixup mac_key (#16361) (#26099)

[upstream:c2acc215da681dce7c0fb5046336af3e96f35dde]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

.changelog/16361.txt

@@ -0,0 +1,3 @@
+```release-note:bug
+publicca: fixed `mac_key` not set in `google_public_ca_external_account_key`
+```

google/services/publicca/resource_public_ca_external_account_key.go

@@ -206,17 +206,11 @@ func resourcePublicCAExternalAccountKeyCreate(d *schema.ResourceData, meta inter
 	if err != nil {
 		return fmt.Errorf("Error creating ExternalAccountKey: %s", err)
 	}
-	if err := d.Set("name", flattenPublicCAExternalAccountKeyName(res["name"], d, config)); err != nil {
-		return fmt.Errorf(`Error setting computed identity field "name": %s`, err)
-	}
-	if err := d.Set("key_id", flattenPublicCAExternalAccountKeyKeyId(res["keyId"], d, config)); err != nil {
-		return fmt.Errorf(`Error setting computed identity field "key_id": %s`, err)
-	}
-	if err := d.Set("b64_mac_key", flattenPublicCAExternalAccountKeyB64MacKey(res["b64MacKey"], d, config)); err != nil {
-		return fmt.Errorf(`Error setting computed identity field "b64_mac_key": %s`, err)
-	}
-	if err := d.Set("b64url_mac_key", flattenPublicCAExternalAccountKeyB64urlMacKey(res["b64MacKey"], d, config)); err != nil {
-		return fmt.Errorf(`Error setting computed identity field "b64url_mac_key": %s`, err)
+	// Set computed resource properties from create API response so that they're available on the subsequent Read
+	// call.
+	err = resourcePublicCAExternalAccountKeyPostCreateSetComputedFields(d, meta, res)
+	if err != nil {
+		return fmt.Errorf("setting computed ID format fields: %w", err)
 	}
 
 	// Store the ID now
@@ -226,6 +220,18 @@ func resourcePublicCAExternalAccountKeyCreate(d *schema.ResourceData, meta inter
 	}
 	d.SetId(id)
 
+	if err := d.Set("b64_mac_key", flattenPublicCAExternalAccountKeyB64MacKey(res["b64MacKey"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ExternalAccountKey: %s", err)
+	}
+
+	if err := d.Set("b64url_mac_key", flattenPublicCAExternalAccountKeyB64urlMacKey(res["b64MacKey"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ExternalAccountKey: %s", err)
+	}
+
+	if err := d.Set("mac_key", flattenPublicCAExternalAccountKeyMacKey(res["b64MacKey"], d, config)); err != nil {
+		return fmt.Errorf("Error reading ExternalAccountKey: %s", err)
+	}
+
 	log.Printf("[DEBUG] Finished creating ExternalAccountKey %q: %#v", d.Id(), res)
 
 	return resourcePublicCAExternalAccountKeyRead(d, meta)

google/services/publicca/resource_public_ca_external_account_key_generated_meta.yaml

@@ -6,9 +6,11 @@ api_version: v1
 api_resource_type_kind: ExternalAccountKey
 fields:
     - api_field: b64MacKey
-    - api_field: b64urlMacKey
+    - api_field: b64MacKey
+      field: b64url_mac_key
     - api_field: keyId
     - field: location
       provider_only: true
-    - api_field: MacKey
+    - api_field: b64MacKey
+      field: mac_key
     - api_field: name

google/services/publicca/resource_public_ca_external_account_key_generated_test.go

@@ -0,0 +1,78 @@
+// Copyright (c) HashiCorp, Inc.
+// SPDX-License-Identifier: MPL-2.0
+// ----------------------------------------------------------------------------
+//
+//	***     AUTO GENERATED CODE    ***    Type: Handwritten     ***
+//
+// ----------------------------------------------------------------------------
+//
+//	This code is generated by Magic Modules using the following:
+//
+//	Source file: https://github.com/GoogleCloudPlatform/magic-modules/tree/main/mmv1/third_party/terraform/services/publicca/resource_public_ca_external_account_key_test.go
+//
+//	DO NOT EDIT this file directly. Any changes made to this file will be
+//	overwritten during the next generation cycle.
+//
+// ----------------------------------------------------------------------------
+package publicca_test
+
+import (
+	"encoding/base64"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
+	"github.com/hashicorp/terraform-provider-google/google/acctest"
+	"github.com/hashicorp/terraform-provider-google/google/envvar"
+)
+
+func TestAccPublicCAExternalAccountKey_publicCaExternalAccountKey(t *testing.T) {
+	t.Parallel()
+
+	context := map[string]interface{}{
+		"project": envvar.GetTestProjectFromEnv(),
+	}
+
+	acctest.VcrTest(t, resource.TestCase{
+		PreCheck:                 func() { acctest.AccTestPreCheck(t) },
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccPublicCAExternalAccountKey_publicCaExternalAccountKey(context),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet("google_public_ca_external_account_key.prod", "b64_mac_key"),
+					resource.TestCheckResourceAttrSet("google_public_ca_external_account_key.prod", "b64url_mac_key"),
+					resource.TestCheckResourceAttrSet("google_public_ca_external_account_key.prod", "mac_key"),
+					resource.TestCheckResourceAttrWith("google_public_ca_external_account_key.prod", "b64_mac_key", func(value string) error {
+						b64key, err := base64.URLEncoding.DecodeString(value)
+						if err != nil {
+							return err
+						}
+						return tryBase64DecodeKey(string(b64key))
+					}),
+					resource.TestCheckResourceAttrWith("google_public_ca_external_account_key.prod", "b64url_mac_key", func(value string) error {
+						b64key, err := base64.RawURLEncoding.DecodeString(value)
+						if err != nil {
+							return err
+						}
+						return tryBase64DecodeKey(string(b64key))
+					}),
+					resource.TestCheckResourceAttrWith("google_public_ca_external_account_key.prod", "mac_key", tryBase64DecodeKey),
+				),
+			},
+		},
+	})
+}
+
+func tryBase64DecodeKey(value string) error {
+	_, err := base64.RawURLEncoding.DecodeString(value)
+	return err
+}
+
+func testAccPublicCAExternalAccountKey_publicCaExternalAccountKey(context map[string]interface{}) string {
+	return acctest.Nprintf(`
+resource "google_public_ca_external_account_key" "prod" {
+  project = "%{project}"
+}
+`, context)
+}

google/services/publicca/resource_public_ca_external_account_key_test.go

@@ -305,14 +305,6 @@ func ValidateBase64String(i interface{}, val string) ([]string, []error) {
 	return nil, nil
 }
 
-func ValidateBase64URLString(i interface{}, val string) ([]string, []error) {
-	_, err := base64.RawURLEncoding.DecodeString(i.(string))
-	if err != nil {
-		return nil, []error{fmt.Errorf("could not decode %q as a valid base64URL value.", val)}
-	}
-	return nil, nil
-}
-
 // StringNotInSlice returns a SchemaValidateFunc which tests if the provided value
 // is of type string and that it matches none of the element in the invalid slice.
 // if ignorecase is true, case is ignored.