Skip to content

Commit 0718d4a

Browse files
tdbhacksSarahFrench
authored andcommitted
Support full resource names in autokey_config.folder (GoogleCloudPlatform#11413)
Co-authored-by: Sarah French <[email protected]>
1 parent 0d5c798 commit 0718d4a

11 files changed

+158
-1
lines changed

mmv1/products/kms/AutokeyConfig.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,14 @@ references: !ruby/object:Api::Resource::ReferenceLinks
3939
id_format: 'folders/{{folder}}/autokeyConfig'
4040
import_format: ['folders/{{folder}}/autokeyConfig']
4141
min_version: beta
42+
# Using a handwritten sweeper because of pre_delete.
43+
skip_sweeper: true
4244
custom_code: !ruby/object:Provider::Terraform::CustomCode
45+
constants: templates/terraform/constants/autokey_config_folder_diff.go.erb
46+
pre_create: templates/terraform/pre_create/kms_autokey_config_folder.go.erb
47+
pre_delete: templates/terraform/pre_delete/kms_autokey_config_folder.go.erb
48+
pre_read: templates/terraform/pre_read/kms_autokey_config_folder.go.erb
49+
pre_update: templates/terraform/pre_update/kms_autokey_config_folder.go.erb
4350
test_check_destroy: templates/terraform/custom_check_destroy/kms_autokey_config.go.erb
4451
examples:
4552
- !ruby/object:Provider::Terraform::Examples
@@ -65,6 +72,7 @@ parameters:
6572
required: true
6673
immutable: true
6774
url_param_only: true
75+
diff_suppress_func: 'folderPrefixSuppress'
6876
description: |
6977
The folder for which to retrieve config.
7078
properties:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
func folderPrefixSuppress(_, old, new string, d *schema.ResourceData) bool {
2+
prefix := "folders/"
3+
return prefix+old == new || prefix+new == old
4+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
func folderPrefixSuppress(_, old, new string, d *schema.ResourceData) bool {
2+
prefix := "folders/"
3+
return prefix+old == new || prefix+new == old
4+
}

mmv1/templates/terraform/custom_check_destroy/kms_autokey_config.go.erb

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
config := acctest.GoogleProviderConfig(t)
22

33
url, err := tpgresource.ReplaceVarsForTest(config, rs, "{{KMSBasePath}}folders/{{folder}}/autokeyConfig")
4+
url = strings.Replace(url, "folders/folders/", "folders/", 1)
45
if err != nil {
56
return err
67
}

mmv1/templates/terraform/examples/kms_autokey_config_all.tf.erb

+8-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,14 @@ resource "time_sleep" "wait_srv_acc_permissions" {
6464

6565
resource "google_kms_autokey_config" "<%= ctx[:primary_resource_id] %>" {
6666
provider = google-beta
67-
folder = google_folder.autokms_folder.folder_id
67+
folder = google_folder.autokms_folder.id
6868
key_project = "projects/${google_project.key_project.project_id}"
6969
depends_on = [time_sleep.wait_srv_acc_permissions]
7070
}
71+
72+
# Wait delay after setting AutokeyConfig, to prevent diffs on reapply,
73+
# because setting the config takes a little to fully propagate.
74+
resource "time_sleep" "wait_autokey_propagation" {
75+
create_duration = "30s"
76+
depends_on = [google_kms_autokey_config.<%= ctx[:primary_resource_id] %>]
77+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
id = strings.Replace(id, "folders/folders/", "folders/", 1)
2+
d.SetId(id)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
url = strings.Replace(url, "folders/folders/", "folders/", 1)
2+
folderValue := d.Get("folder").(string)
3+
folderValue = strings.Replace(folderValue, "folders/", "", 1)
4+
d.Set("folder", folderValue)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
url = strings.Replace(url, "folders/folders/", "folders/", 1)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
url = strings.Replace(url, "folders/folders/", "folders/", 1)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
url = strings.Replace(url, "folders/folders/", "folders/", 1)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
package kms
2+
3+
import (
4+
"context"
5+
"log"
6+
"strings"
7+
"testing"
8+
9+
"github.com/hashicorp/terraform-provider-google/google/envvar"
10+
"github.com/hashicorp/terraform-provider-google/google/sweeper"
11+
"github.com/hashicorp/terraform-provider-google/google/tpgresource"
12+
transport_tpg "github.com/hashicorp/terraform-provider-google/google/transport"
13+
)
14+
15+
func init() {
16+
sweeper.AddTestSweepers("KMSAutokeyConfig", testSweepKMSAutokeyConfig)
17+
}
18+
19+
// At the time of writing, the CI only passes us-central1 as the region
20+
func testSweepKMSAutokeyConfig(region string) error {
21+
resourceName := "KMSAutokeyConfig"
22+
log.Printf("[INFO][SWEEPER_LOG] Starting sweeper for %s", resourceName)
23+
24+
config, err := sweeper.SharedConfigForRegion(region)
25+
if err != nil {
26+
log.Printf("[INFO][SWEEPER_LOG] error getting shared config for region: %s", err)
27+
return err
28+
}
29+
30+
err = config.LoadAndValidate(context.Background())
31+
if err != nil {
32+
log.Printf("[INFO][SWEEPER_LOG] error loading: %s", err)
33+
return err
34+
}
35+
36+
t := &testing.T{}
37+
billingId := envvar.GetTestBillingAccountFromEnv(t)
38+
39+
// Setup variables to replace in list template
40+
d := &tpgresource.ResourceDataMock{
41+
FieldsInSchema: map[string]interface{}{
42+
"project": config.Project,
43+
"region": region,
44+
"location": region,
45+
"zone": "-",
46+
"billing_account": billingId,
47+
},
48+
}
49+
50+
listTemplate := strings.Split("https://cloudkms.googleapis.com/v1/folders/{{folder}}/autokeyConfig", "?")[0]
51+
listUrl, err := tpgresource.ReplaceVars(d, config, listTemplate)
52+
listUrl = strings.Replace(listUrl, "folders/folders/", "folders/", 1)
53+
if err != nil {
54+
log.Printf("[INFO][SWEEPER_LOG] error preparing sweeper list url: %s", err)
55+
return nil
56+
}
57+
58+
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
59+
Config: config,
60+
Method: "GET",
61+
Project: config.Project,
62+
RawURL: listUrl,
63+
UserAgent: config.UserAgent,
64+
})
65+
if err != nil {
66+
log.Printf("[INFO][SWEEPER_LOG] Error in response from request %s: %s", listUrl, err)
67+
return nil
68+
}
69+
70+
resourceList, ok := res["autokeyConfigs"]
71+
if !ok {
72+
log.Printf("[INFO][SWEEPER_LOG] Nothing found in response.")
73+
return nil
74+
}
75+
76+
rl := resourceList.([]interface{})
77+
78+
log.Printf("[INFO][SWEEPER_LOG] Found %d items in %s list response.", len(rl), resourceName)
79+
// Keep count of items that aren't sweepable for logging.
80+
nonPrefixCount := 0
81+
for _, ri := range rl {
82+
obj := ri.(map[string]interface{})
83+
if obj["name"] == nil {
84+
log.Printf("[INFO][SWEEPER_LOG] %s resource name was nil", resourceName)
85+
return nil
86+
}
87+
88+
name := tpgresource.GetResourceNameFromSelfLink(obj["name"].(string))
89+
// Skip resources that shouldn't be sweeped
90+
if !sweeper.IsSweepableTestResource(name) {
91+
nonPrefixCount++
92+
continue
93+
}
94+
95+
deleteTemplate := "https://cloudkms.googleapis.com/v1/folders/{{folder}}/autokeyConfig?updateMask=keyProject"
96+
deleteUrl, err := tpgresource.ReplaceVars(d, config, deleteTemplate)
97+
if err != nil {
98+
log.Printf("[INFO][SWEEPER_LOG] error preparing delete url: %s", err)
99+
return nil
100+
}
101+
deleteUrl = deleteUrl + name
102+
deleteUrl = strings.Replace(deleteUrl, "folders/folders/", "folders/", 1)
103+
104+
// Don't wait on operations as we may have a lot to delete
105+
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
106+
Config: config,
107+
Method: "DELETE",
108+
Project: config.Project,
109+
RawURL: deleteUrl,
110+
UserAgent: config.UserAgent,
111+
})
112+
if err != nil {
113+
log.Printf("[INFO][SWEEPER_LOG] Error deleting for url %s : %s", deleteUrl, err)
114+
} else {
115+
log.Printf("[INFO][SWEEPER_LOG] Sent delete request for %s resource: %s", resourceName, name)
116+
}
117+
}
118+
119+
if nonPrefixCount > 0 {
120+
log.Printf("[INFO][SWEEPER_LOG] %d items were non-sweepable and skipped.", nonPrefixCount)
121+
}
122+
123+
return nil
124+
}

0 commit comments

Comments
 (0)