Skip to content

Commit f2aac83

Browse files
modular-magicianmodular-magician
authored
Upgrade DCL to 1.61.0 (#9807) (#16988)
[upstream:37a849b68960966a4ca9dab2d87476137d2b096b] Signed-off-by: Modular Magician <[email protected]>
1 parent 2ea5e6a commit f2aac83

File tree

5 files changed

+18
-17
lines changed

5 files changed

+18
-17
lines changed

‎.changelog/9807.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
doc: updated documentation for `allow_all`, `deny_all` and `enforce` fields in `google_org_policy_policy` resource
3+
```

‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ go 1.20
33

44
require (
55
cloud.google.com/go/bigtable v1.19.0
6-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0
6+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0
77
github.com/apparentlymart/go-cidr v1.1.0
88
github.com/davecgh/go-spew v1.1.1
99
github.com/dnaeon/go-vcr v1.0.1

‎go.sum

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXE
1515
cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
1616
cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
1717
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
18-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.59.0 h1:jL4ac+IUrVftmfduFslaMXWj9ENuiXEiwZFw3U5ikUA=
19-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.59.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
2018
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
2119
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
2220
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
@@ -460,5 +458,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
460458
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
461459
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
462460
rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
463-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0 h1:RFZs9I3tXewC7cJf8RKbUMpQZO6jWZ9SHSnNd+auxsQ=
464-
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
461+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0 h1:IAr9UlYbxURIYABRMagXXo8pDlkFNFFXWz5J2+srrnc=
462+
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=

‎google/services/orgpolicy/resource_org_policy_policy.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ func OrgPolicyPolicyDryRunSpecRulesSchema() *schema.Resource {
135135
"allow_all": {
136136
Type: schema.TypeString,
137137
Optional: true,
138-
Description: "Setting this to true means that all values are allowed. This field can be set only in policies for list constraints.",
138+
Description: "Setting this to `\"TRUE\"` means that all values are allowed. This field can be set only in policies for list constraints.",
139139
},
140140

141141
"condition": {
@@ -149,13 +149,13 @@ func OrgPolicyPolicyDryRunSpecRulesSchema() *schema.Resource {
149149
"deny_all": {
150150
Type: schema.TypeString,
151151
Optional: true,
152-
Description: "Setting this to true means that all values are denied. This field can be set only in policies for list constraints.",
152+
Description: "Setting this to `\"TRUE\"` means that all values are denied. This field can be set only in policies for list constraints.",
153153
},
154154

155155
"enforce": {
156156
Type: schema.TypeString,
157157
Optional: true,
158-
Description: "If `true`, then the policy is enforced. If `false`, then any configuration is acceptable. This field can be set only in policies for boolean constraints.",
158+
Description: "If `\"TRUE\"`, then the policy is enforced. If `\"FALSE\"`, then any configuration is acceptable. This field can be set only in policies for boolean constraints.",
159159
},
160160

161161
"values": {
@@ -262,7 +262,7 @@ func OrgPolicyPolicySpecRulesSchema() *schema.Resource {
262262
"allow_all": {
263263
Type: schema.TypeString,
264264
Optional: true,
265-
Description: "Setting this to true means that all values are allowed. This field can be set only in Policies for list constraints.",
265+
Description: "Setting this to `\"TRUE\"` means that all values are allowed. This field can be set only in Policies for list constraints.",
266266
},
267267

268268
"condition": {
@@ -276,13 +276,13 @@ func OrgPolicyPolicySpecRulesSchema() *schema.Resource {
276276
"deny_all": {
277277
Type: schema.TypeString,
278278
Optional: true,
279-
Description: "Setting this to true means that all values are denied. This field can be set only in Policies for list constraints.",
279+
Description: "Setting this to `\"TRUE\"` means that all values are denied. This field can be set only in Policies for list constraints.",
280280
},
281281

282282
"enforce": {
283283
Type: schema.TypeString,
284284
Optional: true,
285-
Description: "If `true`, then the `Policy` is enforced. If `false`, then any configuration is acceptable. This field can be set only in Policies for boolean constraints.",
285+
Description: "If `\"TRUE\"`, then the `Policy` is enforced. If `\"FALSE\"`, then any configuration is acceptable. This field can be set only in Policies for boolean constraints.",
286286
},
287287

288288
"values": {

‎website/docs/r/org_policy_policy.html.markdown

+6-6
Original file line numberDiff line numberDiff line change
@@ -205,19 +205,19 @@ The `rules` block supports:
205205

206206
* `allow_all` -
207207
(Optional)
208-
Setting this to true means that all values are allowed. This field can be set only in policies for list constraints.
208+
Setting this to `"TRUE"` means that all values are allowed. This field can be set only in policies for list constraints.
209209

210210
* `condition` -
211211
(Optional)
212212
A condition which determines whether this rule is used in the evaluation of the policy. When set, the `expression` field in the `Expr' must include from 1 to 10 subexpressions, joined by the "||" or "&&" operators. Each subexpression must be of the form "resource.matchTag('/tag_key_short_name, 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id', 'tagValues/value_id')". where key_name and value_name are the resource names for Label Keys and Values. These names are available from the Tag Manager Service. An example expression is: "resource.matchTag('123456789/environment, 'prod')". or "resource.matchTagId('tagKeys/123', 'tagValues/456')".
213213

214214
* `deny_all` -
215215
(Optional)
216-
Setting this to true means that all values are denied. This field can be set only in policies for list constraints.
216+
Setting this to `"TRUE"` means that all values are denied. This field can be set only in policies for list constraints.
217217

218218
* `enforce` -
219219
(Optional)
220-
If `true`, then the policy is enforced. If `false`, then any configuration is acceptable. This field can be set only in policies for boolean constraints.
220+
If `"TRUE"`, then the policy is enforced. If `"FALSE"`, then any configuration is acceptable. This field can be set only in policies for boolean constraints.
221221

222222
* `values` -
223223
(Optional)
@@ -275,19 +275,19 @@ The `rules` block supports:
275275

276276
* `allow_all` -
277277
(Optional)
278-
Setting this to true means that all values are allowed. This field can be set only in Policies for list constraints.
278+
Setting this to `"TRUE"` means that all values are allowed. This field can be set only in Policies for list constraints.
279279

280280
* `condition` -
281281
(Optional)
282282
A condition which determines whether this rule is used in the evaluation of the policy. When set, the `expression` field in the `Expr' must include from 1 to 10 subexpressions, joined by the "||" or "&&" operators. Each subexpression must be of the form "resource.matchTag('/tag_key_short_name, 'tag_value_short_name')". or "resource.matchTagId('tagKeys/key_id', 'tagValues/value_id')". where key_name and value_name are the resource names for Label Keys and Values. These names are available from the Tag Manager Service. An example expression is: "resource.matchTag('123456789/environment, 'prod')". or "resource.matchTagId('tagKeys/123', 'tagValues/456')".
283283

284284
* `deny_all` -
285285
(Optional)
286-
Setting this to true means that all values are denied. This field can be set only in Policies for list constraints.
286+
Setting this to `"TRUE"` means that all values are denied. This field can be set only in Policies for list constraints.
287287

288288
* `enforce` -
289289
(Optional)
290-
If `true`, then the `Policy` is enforced. If `false`, then any configuration is acceptable. This field can be set only in Policies for boolean constraints.
290+
If `"TRUE"`, then the `Policy` is enforced. If `"FALSE"`, then any configuration is acceptable. This field can be set only in Policies for boolean constraints.
291291

292292
* `values` -
293293
(Optional)

0 commit comments

Comments
 (0)