Skip to content

Commit 17bf5f5

Browse files
modular-magicianmodular-magician
authored
Added iam policy support for tag value and tag key (#4660) (#3124)
* Added iam policy support for tag value and tag key * Added IAM tests * Corrected request method for getIamPolicy Signed-off-by: Modular Magician <[email protected]>
1 parent be9aad5 commit 17bf5f5

File tree

8 files changed

+1048
-7
lines changed

8 files changed

+1048
-7
lines changed

‎.changelog/4660.txt‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
```release-note:new-resource
2+
`google_tags_tag_key_iam_binding`
3+
```
4+
```release-note:new-resource
5+
`google_tags_tag_key_iam_member`
6+
```
7+
```release-note:new-resource
8+
`google_tags_tag_key_iam_policy`
9+
```
10+
```release-note:new-resource
11+
`google_tags_tag_value_iam_binding`
12+
```
13+
```release-note:new-resource
14+
`google_tags_tag_value_iam_member`
15+
```
16+
```release-note:new-resource
17+
`google_tags_tag_value_iam_policy`
18+
```

‎google-beta/iam_tags_tag_key.go‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
// ----------------------------------------------------------------------------
2+
//
3+
// *** AUTO GENERATED CODE *** AUTO GENERATED CODE ***
4+
//
5+
// ----------------------------------------------------------------------------
6+
//
7+
// This file is automatically generated by Magic Modules and manual
8+
// changes will be clobbered when the file is regenerated.
9+
//
10+
// Please read more about how to change this file in
11+
// .github/CONTRIBUTING.md.
12+
//
13+
// ----------------------------------------------------------------------------
14+
package google
15+
16+
import (
17+
"fmt"
18+
19+
"github.com/hashicorp/errwrap"
20+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
21+
"google.golang.org/api/cloudresourcemanager/v1"
22+
)
23+
24+
var TagsTagKeyIamSchema = map[string]*schema.Schema{
25+
"tag_key": {
26+
Type: schema.TypeString,
27+
Required: true,
28+
ForceNew: true,
29+
DiffSuppressFunc: compareSelfLinkOrResourceName,
30+
},
31+
}
32+
33+
type TagsTagKeyIamUpdater struct {
34+
tagKey string
35+
d TerraformResourceData
36+
Config *Config
37+
}
38+
39+
func TagsTagKeyIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
40+
values := make(map[string]string)
41+
42+
if v, ok := d.GetOk("tag_key"); ok {
43+
values["tag_key"] = v.(string)
44+
}
45+
46+
// We may have gotten either a long or short name, so attempt to parse long name if possible
47+
m, err := getImportIdQualifiers([]string{"tagKeys/(?P<tag_key>[^/]+)", "(?P<tag_key>[^/]+)"}, d, config, d.Get("tag_key").(string))
48+
if err != nil {
49+
return nil, err
50+
}
51+
52+
for k, v := range m {
53+
values[k] = v
54+
}
55+
56+
u := &TagsTagKeyIamUpdater{
57+
tagKey: values["tag_key"],
58+
d: d,
59+
Config: config,
60+
}
61+
62+
if err := d.Set("tag_key", u.GetResourceId()); err != nil {
63+
return nil, fmt.Errorf("Error setting tag_key: %s", err)
64+
}
65+
66+
return u, nil
67+
}
68+
69+
func TagsTagKeyIdParseFunc(d *schema.ResourceData, config *Config) error {
70+
values := make(map[string]string)
71+
72+
m, err := getImportIdQualifiers([]string{"tagKeys/(?P<tag_key>[^/]+)", "(?P<tag_key>[^/]+)"}, d, config, d.Id())
73+
if err != nil {
74+
return err
75+
}
76+
77+
for k, v := range m {
78+
values[k] = v
79+
}
80+
81+
u := &TagsTagKeyIamUpdater{
82+
tagKey: values["tag_key"],
83+
d: d,
84+
Config: config,
85+
}
86+
if err := d.Set("tag_key", u.GetResourceId()); err != nil {
87+
return fmt.Errorf("Error setting tag_key: %s", err)
88+
}
89+
d.SetId(u.GetResourceId())
90+
return nil
91+
}
92+
93+
func (u *TagsTagKeyIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
94+
url, err := u.qualifyTagKeyUrl("getIamPolicy")
95+
if err != nil {
96+
return nil, err
97+
}
98+
99+
var obj map[string]interface{}
100+
101+
userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
102+
if err != nil {
103+
return nil, err
104+
}
105+
106+
policy, err := sendRequest(u.Config, "POST", "", url, userAgent, obj)
107+
if err != nil {
108+
return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
109+
}
110+
111+
out := &cloudresourcemanager.Policy{}
112+
err = Convert(policy, out)
113+
if err != nil {
114+
return nil, errwrap.Wrapf("Cannot convert a policy to a resource manager policy: {{err}}", err)
115+
}
116+
117+
return out, nil
118+
}
119+
120+
func (u *TagsTagKeyIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
121+
json, err := ConvertToMap(policy)
122+
if err != nil {
123+
return err
124+
}
125+
126+
obj := make(map[string]interface{})
127+
obj["policy"] = json
128+
129+
url, err := u.qualifyTagKeyUrl("setIamPolicy")
130+
if err != nil {
131+
return err
132+
}
133+
134+
userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
135+
if err != nil {
136+
return err
137+
}
138+
139+
_, err = sendRequestWithTimeout(u.Config, "POST", "", url, userAgent, obj, u.d.Timeout(schema.TimeoutCreate))
140+
if err != nil {
141+
return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
142+
}
143+
144+
return nil
145+
}
146+
147+
func (u *TagsTagKeyIamUpdater) qualifyTagKeyUrl(methodIdentifier string) (string, error) {
148+
urlTemplate := fmt.Sprintf("{{TagsBasePath}}%s:%s", fmt.Sprintf("tagKeys/%s", u.tagKey), methodIdentifier)
149+
url, err := replaceVars(u.d, u.Config, urlTemplate)
150+
if err != nil {
151+
return "", err
152+
}
153+
return url, nil
154+
}
155+
156+
func (u *TagsTagKeyIamUpdater) GetResourceId() string {
157+
return fmt.Sprintf("tagKeys/%s", u.tagKey)
158+
}
159+
160+
func (u *TagsTagKeyIamUpdater) GetMutexKey() string {
161+
return fmt.Sprintf("iam-tags-tagkey-%s", u.GetResourceId())
162+
}
163+
164+
func (u *TagsTagKeyIamUpdater) DescribeResource() string {
165+
return fmt.Sprintf("tags tagkey %q", u.GetResourceId())
166+
}

‎google-beta/iam_tags_tag_value.go‎

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
// ----------------------------------------------------------------------------
2+
//
3+
// *** AUTO GENERATED CODE *** AUTO GENERATED CODE ***
4+
//
5+
// ----------------------------------------------------------------------------
6+
//
7+
// This file is automatically generated by Magic Modules and manual
8+
// changes will be clobbered when the file is regenerated.
9+
//
10+
// Please read more about how to change this file in
11+
// .github/CONTRIBUTING.md.
12+
//
13+
// ----------------------------------------------------------------------------
14+
package google
15+
16+
import (
17+
"fmt"
18+
19+
"github.com/hashicorp/errwrap"
20+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
21+
"google.golang.org/api/cloudresourcemanager/v1"
22+
)
23+
24+
var TagsTagValueIamSchema = map[string]*schema.Schema{
25+
"tag_value": {
26+
Type: schema.TypeString,
27+
Required: true,
28+
ForceNew: true,
29+
DiffSuppressFunc: compareSelfLinkOrResourceName,
30+
},
31+
}
32+
33+
type TagsTagValueIamUpdater struct {
34+
tagValue string
35+
d TerraformResourceData
36+
Config *Config
37+
}
38+
39+
func TagsTagValueIamUpdaterProducer(d TerraformResourceData, config *Config) (ResourceIamUpdater, error) {
40+
values := make(map[string]string)
41+
42+
if v, ok := d.GetOk("tag_value"); ok {
43+
values["tag_value"] = v.(string)
44+
}
45+
46+
// We may have gotten either a long or short name, so attempt to parse long name if possible
47+
m, err := getImportIdQualifiers([]string{"tagValues/(?P<tag_value>[^/]+)", "(?P<tag_value>[^/]+)"}, d, config, d.Get("tag_value").(string))
48+
if err != nil {
49+
return nil, err
50+
}
51+
52+
for k, v := range m {
53+
values[k] = v
54+
}
55+
56+
u := &TagsTagValueIamUpdater{
57+
tagValue: values["tag_value"],
58+
d: d,
59+
Config: config,
60+
}
61+
62+
if err := d.Set("tag_value", u.GetResourceId()); err != nil {
63+
return nil, fmt.Errorf("Error setting tag_value: %s", err)
64+
}
65+
66+
return u, nil
67+
}
68+
69+
func TagsTagValueIdParseFunc(d *schema.ResourceData, config *Config) error {
70+
values := make(map[string]string)
71+
72+
m, err := getImportIdQualifiers([]string{"tagValues/(?P<tag_value>[^/]+)", "(?P<tag_value>[^/]+)"}, d, config, d.Id())
73+
if err != nil {
74+
return err
75+
}
76+
77+
for k, v := range m {
78+
values[k] = v
79+
}
80+
81+
u := &TagsTagValueIamUpdater{
82+
tagValue: values["tag_value"],
83+
d: d,
84+
Config: config,
85+
}
86+
if err := d.Set("tag_value", u.GetResourceId()); err != nil {
87+
return fmt.Errorf("Error setting tag_value: %s", err)
88+
}
89+
d.SetId(u.GetResourceId())
90+
return nil
91+
}
92+
93+
func (u *TagsTagValueIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
94+
url, err := u.qualifyTagValueUrl("getIamPolicy")
95+
if err != nil {
96+
return nil, err
97+
}
98+
99+
var obj map[string]interface{}
100+
101+
userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
102+
if err != nil {
103+
return nil, err
104+
}
105+
106+
policy, err := sendRequest(u.Config, "POST", "", url, userAgent, obj)
107+
if err != nil {
108+
return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
109+
}
110+
111+
out := &cloudresourcemanager.Policy{}
112+
err = Convert(policy, out)
113+
if err != nil {
114+
return nil, errwrap.Wrapf("Cannot convert a policy to a resource manager policy: {{err}}", err)
115+
}
116+
117+
return out, nil
118+
}
119+
120+
func (u *TagsTagValueIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
121+
json, err := ConvertToMap(policy)
122+
if err != nil {
123+
return err
124+
}
125+
126+
obj := make(map[string]interface{})
127+
obj["policy"] = json
128+
129+
url, err := u.qualifyTagValueUrl("setIamPolicy")
130+
if err != nil {
131+
return err
132+
}
133+
134+
userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
135+
if err != nil {
136+
return err
137+
}
138+
139+
_, err = sendRequestWithTimeout(u.Config, "POST", "", url, userAgent, obj, u.d.Timeout(schema.TimeoutCreate))
140+
if err != nil {
141+
return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
142+
}
143+
144+
return nil
145+
}
146+
147+
func (u *TagsTagValueIamUpdater) qualifyTagValueUrl(methodIdentifier string) (string, error) {
148+
urlTemplate := fmt.Sprintf("{{TagsBasePath}}%s:%s", fmt.Sprintf("tagValues/%s", u.tagValue), methodIdentifier)
149+
url, err := replaceVars(u.d, u.Config, urlTemplate)
150+
if err != nil {
151+
return "", err
152+
}
153+
return url, nil
154+
}
155+
156+
func (u *TagsTagValueIamUpdater) GetResourceId() string {
157+
return fmt.Sprintf("tagValues/%s", u.tagValue)
158+
}
159+
160+
func (u *TagsTagValueIamUpdater) GetMutexKey() string {
161+
return fmt.Sprintf("iam-tags-tagvalue-%s", u.GetResourceId())
162+
}
163+
164+
func (u *TagsTagValueIamUpdater) DescribeResource() string {
165+
return fmt.Sprintf("tags tagvalue %q", u.GetResourceId())
166+
}

‎google-beta/provider.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -844,8 +844,8 @@ func Provider() *schema.Provider {
844844
}
845845

846846
// Generated resources: 220
847-
// Generated IAM resources: 111
848-
// Total generated resources: 331
847+
// Generated IAM resources: 117
848+
// Total generated resources: 337
849849
func ResourceMap() map[string]*schema.Resource {
850850
resourceMap, _ := ResourceMapWithErrors()
851851
return resourceMap
@@ -1180,7 +1180,13 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
11801180
"google_storage_default_object_access_control": resourceStorageDefaultObjectAccessControl(),
11811181
"google_storage_hmac_key": resourceStorageHmacKey(),
11821182
"google_tags_tag_key": resourceTagsTagKey(),
1183+
"google_tags_tag_key_iam_binding": ResourceIamBinding(TagsTagKeyIamSchema, TagsTagKeyIamUpdaterProducer, TagsTagKeyIdParseFunc),
1184+
"google_tags_tag_key_iam_member": ResourceIamMember(TagsTagKeyIamSchema, TagsTagKeyIamUpdaterProducer, TagsTagKeyIdParseFunc),
1185+
"google_tags_tag_key_iam_policy": ResourceIamPolicy(TagsTagKeyIamSchema, TagsTagKeyIamUpdaterProducer, TagsTagKeyIdParseFunc),
11831186
"google_tags_tag_value": resourceTagsTagValue(),
1187+
"google_tags_tag_value_iam_binding": ResourceIamBinding(TagsTagValueIamSchema, TagsTagValueIamUpdaterProducer, TagsTagValueIdParseFunc),
1188+
"google_tags_tag_value_iam_member": ResourceIamMember(TagsTagValueIamSchema, TagsTagValueIamUpdaterProducer, TagsTagValueIdParseFunc),
1189+
"google_tags_tag_value_iam_policy": ResourceIamPolicy(TagsTagValueIamSchema, TagsTagValueIamUpdaterProducer, TagsTagValueIdParseFunc),
11841190
"google_tags_tag_binding": resourceTagsTagBinding(),
11851191
"google_tpu_node": resourceTPUNode(),
11861192
"google_vpc_access_connector": resourceVPCAccessConnector(),

0 commit comments

Comments
 (0)