Support full resource names in autokey_config.folder (#11413) (#8100)

[upstream:ba356a39c6c948916aab77da2dc0cab22b95d70a]

Signed-off-by: Modular Magician <[email protected]>

Author: modular-magician

.changelog/11413.txt

@@ -0,0 +1,3 @@
+```release-note:enhancement
+kms: updated the `google_kms_autokey_config` resource's `folder` field to accept values that are either full resource names (`folders/{folder_id}`) or just the folder id (`{folder_id}` only)
+```

google-beta/services/kms/resource_kms_autokey_config.go

@@ -22,6 +22,7 @@ import (
 	"log"
 	"net/http"
 	"reflect"
+	"strings"
 	"time"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
@@ -30,6 +31,11 @@ import (
 	transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport"
 )
 
+func folderPrefixSuppress(_, old, new string, d *schema.ResourceData) bool {
+	prefix := "folders/"
+	return prefix+old == new || prefix+new == old
+}
+
 func ResourceKMSAutokeyConfig() *schema.Resource {
 	return &schema.Resource{
 		Create: resourceKMSAutokeyConfigCreate,
@@ -49,10 +55,11 @@ func ResourceKMSAutokeyConfig() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"folder": {
-				Type:        schema.TypeString,
-				Required:    true,
-				ForceNew:    true,
-				Description: `The folder for which to retrieve config.`,
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				DiffSuppressFunc: folderPrefixSuppress,
+				Description:      `The folder for which to retrieve config.`,
 			},
 			"key_project": {
 				Type:     schema.TypeString,
@@ -95,6 +102,10 @@ func resourceKMSAutokeyConfigCreate(d *schema.ResourceData, meta interface{}) er
 	}
 
 	headers := make(http.Header)
+	url = strings.Replace(url, "folders/folders/", "folders/", 1)
+	folderValue := d.Get("folder").(string)
+	folderValue = strings.Replace(folderValue, "folders/", "", 1)
+	d.Set("folder", folderValue)
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,
 		Method:    "PATCH",
@@ -141,6 +152,7 @@ func resourceKMSAutokeyConfigRead(d *schema.ResourceData, meta interface{}) erro
 	}
 
 	headers := make(http.Header)
+	url = strings.Replace(url, "folders/folders/", "folders/", 1)
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
 		Config:    config,
 		Method:    "GET",
@@ -184,6 +196,7 @@ func resourceKMSAutokeyConfigUpdate(d *schema.ResourceData, meta interface{}) er
 
 	log.Printf("[DEBUG] Updating AutokeyConfig %q: %#v", d.Id(), obj)
 	headers := make(http.Header)
+	url = strings.Replace(url, "folders/folders/", "folders/", 1)
 
 	// err == nil indicates that the billing_project value was found
 	if bp, err := tpgresource.GetBillingProject(d, config); err == nil {
@@ -232,6 +245,7 @@ func resourceKMSAutokeyConfigDelete(d *schema.ResourceData, meta interface{}) er
 	}
 
 	headers := make(http.Header)
+	url = strings.Replace(url, "folders/folders/", "folders/", 1)
 
 	log.Printf("[DEBUG] Deleting AutokeyConfig %q", d.Id())
 	res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{

google-beta/services/kms/resource_kms_autokey_config_generated_test.go

@@ -131,10 +131,17 @@ resource "time_sleep" "wait_srv_acc_permissions" {
 
 resource "google_kms_autokey_config" "example-autokeyconfig" {
   provider    = google-beta
-  folder      = google_folder.autokms_folder.folder_id
+  folder      = google_folder.autokms_folder.id
   key_project = "projects/${google_project.key_project.project_id}"
   depends_on  = [time_sleep.wait_srv_acc_permissions]
 }
+
+# Wait delay after setting AutokeyConfig, to prevent diffs on reapply,
+# because setting the config takes a little to fully propagate.
+resource "time_sleep" "wait_autokey_propagation" {
+  create_duration = "30s"
+  depends_on      = [google_kms_autokey_config.example-autokeyconfig]
+}
 `, context)
 }
 
@@ -151,6 +158,7 @@ func testAccCheckKMSAutokeyConfigDestroyProducer(t *testing.T) func(s *terraform
 			config := acctest.GoogleProviderConfig(t)
 
 			url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{KMSBasePath}}folders/{{folder}}/autokeyConfig")
+			url = strings.Replace(url, "folders/folders/", "folders/", 1)
 			if err != nil {
 				return err
 			}

google-beta/services/kms/resource_kms_autokey_config_sweeper.go

@@ -1,20 +1,5 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: MPL-2.0
-
-// ----------------------------------------------------------------------------
-//
-//     ***     AUTO GENERATED CODE    ***    Type: MMv1     ***
-//
-// ----------------------------------------------------------------------------
-//
-//     This file is automatically generated by Magic Modules and manual
-//     changes will be clobbered when the file is regenerated.
-//
-//     Please read more about how to change this file in
-//     .github/CONTRIBUTING.md.
-//
-// ----------------------------------------------------------------------------
-
 package kms
 
 import (
@@ -66,6 +51,7 @@ func testSweepKMSAutokeyConfig(region string) error {
 
 	listTemplate := strings.Split("https://cloudkms.googleapis.com/v1/folders/{{folder}}/autokeyConfig", "?")[0]
 	listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
+	listUrl = strings.Replace(listUrl, "folders/folders/", "folders/", 1)
 	if err != nil {
 		log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
 		return nil
@@ -115,6 +101,7 @@ func testSweepKMSAutokeyConfig(region string) error {
 			return nil
 		}
 		deleteUrl = deleteUrl + name
+		deleteUrl = strings.Replace(deleteUrl, "folders/folders/", "folders/", 1)
 
 		// Don't wait on operations as we may have a lot to delete
 		_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{

website/docs/r/kms_autokey_config.html.markdown

@@ -107,10 +107,17 @@ resource "time_sleep" "wait_srv_acc_permissions" {
 
 resource "google_kms_autokey_config" "example-autokeyconfig" {
   provider    = google-beta
-  folder      = google_folder.autokms_folder.folder_id
+  folder      = google_folder.autokms_folder.id
   key_project = "projects/${google_project.key_project.project_id}"
   depends_on  = [time_sleep.wait_srv_acc_permissions]
 }
+
+# Wait delay after setting AutokeyConfig, to prevent diffs on reapply,
+# because setting the config takes a little to fully propagate.
+resource "time_sleep" "wait_autokey_propagation" {
+  create_duration = "30s"
+  depends_on      = [google_kms_autokey_config.example-autokeyconfig]
+}
 ```
 
 ## Argument Reference