Skip to content

Commit

Permalink
Upgrade DCL to 1.61.0 (#9807) (#16988)
Browse files Browse the repository at this point in the history
[upstream:37a849b68960966a4ca9dab2d87476137d2b096b]

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Jan 12, 2024
1 parent 2ea5e6a commit f2aac83
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 17 deletions.
3 changes: 3 additions & 0 deletions .changelog/9807.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:none
doc: updated documentation for `allow_all`, `deny_all` and `enforce` fields in `google_org_policy_policy` resource
```
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ go 1.20

require (
cloud.google.com/go/bigtable v1.19.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0
github.com/apparentlymart/go-cidr v1.1.0
github.com/davecgh/go-spew v1.1.1
github.com/dnaeon/go-vcr v1.0.1
Expand Down
6 changes: 2 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ cloud.google.com/go/iam v1.1.5/go.mod h1:rB6P/Ic3mykPbFio+vo7403drjlgvoWfYpJhMXE
cloud.google.com/go/longrunning v0.5.4 h1:w8xEcbZodnA2BbW6sVirkkoC+1gP8wS57EUUgGS0GVg=
cloud.google.com/go/longrunning v0.5.4/go.mod h1:zqNVncI0BOP8ST6XQD1+VcvuShMmq7+xFSzOL++V0dI=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.59.0 h1:jL4ac+IUrVftmfduFslaMXWj9ENuiXEiwZFw3U5ikUA=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.59.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
github.com/Microsoft/go-winio v0.4.16 h1:FtSW/jqD+l4ba5iPBj9CODVtgfYAD8w2wS923g/cFDk=
github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
Expand Down Expand Up @@ -460,5 +458,5 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
rsc.io/binaryregexp v0.2.0 h1:HfqmD5MEmC0zvwBuF187nq9mdnXjXsSivRiXN7SmRkE=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0 h1:RFZs9I3tXewC7cJf8RKbUMpQZO6jWZ9SHSnNd+auxsQ=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.60.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0 h1:IAr9UlYbxURIYABRMagXXo8pDlkFNFFXWz5J2+srrnc=
github.com/GoogleCloudPlatform/declarative-resource-client-library v1.61.0/go.mod h1:pL2Qt5HT+x6xrTd806oMiM3awW6kNIXB/iiuClz6m6k=
12 changes: 6 additions & 6 deletions google/services/orgpolicy/resource_org_policy_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ func OrgPolicyPolicyDryRunSpecRulesSchema() *schema.Resource {
"allow_all": {
Type: schema.TypeString,
Optional: true,
Description: "Setting this to true means that all values are allowed. This field can be set only in policies for list constraints.",
Description: "Setting this to `\"TRUE\"` means that all values are allowed. This field can be set only in policies for list constraints.",
},

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

"enforce": {
Type: schema.TypeString,
Optional: true,
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.",
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.",
},

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

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

"enforce": {
Type: schema.TypeString,
Optional: true,
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.",
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.",
},

"values": {
Expand Down
12 changes: 6 additions & 6 deletions website/docs/r/org_policy_policy.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -205,19 +205,19 @@ The `rules` block supports:

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

* `condition` -
(Optional)
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')".

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

* `enforce` -
(Optional)
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.
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.

* `values` -
(Optional)
Expand Down Expand Up @@ -275,19 +275,19 @@ The `rules` block supports:

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

* `condition` -
(Optional)
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')".

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

* `enforce` -
(Optional)
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.
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.

* `values` -
(Optional)
Expand Down

0 comments on commit f2aac83

Please sign in to comment.