Merge branch 'main' of https://github.com/GoogleCloudPlatform/magic-modules

Author: actions-user

mmv1/products/publicca/ExternalAccountKey.yaml

@@ -75,18 +75,29 @@ properties:
   - name: 'b64MacKey'
     type: String
     description: |
-      Base64-URL-encoded HS256 key. It is generated by the PublicCertificateAuthorityService
+      Doubly Base64-URL-encoded HS256 key ('base64(base64(binary key))'). It is generated by the PublicCertificateAuthorityService
       when the ExternalAccountKey is created.
     sensitive: true
     output: true
-    deprecation_message: '`b64_mac_key` is deprecated and will be removed in a future major release. Use `b64url_mac_key` instead.'
+    deprecation_message: '`b64_mac_key` is deprecated and will be removed in a future major release. Use `mac_key` instead.'
   - name: 'b64urlMacKey'
     type: String
     description: |
-      Base64-URL-encoded HS256 key. It is generated by the PublicCertificateAuthorityService
+      Doubly Base64-URL-encoded HS256 key ('base64(base64(binary key))'). It is generated by the PublicCertificateAuthorityService
       when the ExternalAccountKey is created.'
     sensitive: true
     output: true
+    deprecation_message: '`b64url_mac_key` is deprecated and will be removed in a future major release. Use `mac_key` instead.'
     custom_flatten: 'templates/terraform/custom_flatten/publicca_b64url_mac_key.go.tmpl'
     validation:
       function: 'verify.ValidateBase64URLString()'
+  - name: 'MacKey'
+    type: String
+    description: |
+      Base64-URL-encoded HS256 key. It is generated by the PublicCertificateAuthorityService
+      when the ExternalAccountKey is created.'
+    sensitive: true
+    output: true
+    custom_flatten: 'templates/terraform/custom_flatten/publicca_mac_key.go.tmpl'
+    validation:
+      function: 'verify.ValidateBase64URLString()'

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

@@ -15,7 +15,7 @@ func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.Reso
 		return ""
 	}
 
-    dec, err := base64.RawStdEncoding.DecodeString(v.(string))
+	dec, err := base64.URLEncoding.DecodeString(v.(string))
 	if err != nil {
 		return ""
 	}

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

@@ -0,0 +1,12 @@
+func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} {
+	if v == nil {
+		return ""
+	}
+
+	dec, err := base64.URLEncoding.DecodeString(v.(string))
+	if err != nil {
+		return ""
+	}
+
+	return string(dec)
+}