Skip to content
This repository was archived by the owner on Sep 19, 2023. It is now read-only.

Commit 59f588b

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
feat: Deprecates AlternativePolicySpec (#320)
- [ ] Regenerate this pull request now. PiperOrigin-RevId: 428897918 Source-Link: googleapis/googleapis@bbb3c1f Source-Link: https://github.com/googleapis/googleapis-gen/commit/e29706ef2ea260d1c66037b05af1cd813afa7569 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTI5NzA2ZWYyZWEyNjBkMWM2NjAzN2IwNWFmMWNkODEzYWZhNzU2OSJ9
1 parent dc307fa commit 59f588b

File tree

7 files changed

+314
-290
lines changed

7 files changed

+314
-290
lines changed

‎proto-google-cloud-orgpolicy-v2/src/main/java/com/google/cloud/orgpolicy/v2/Constraint.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
* example, you could enforce a constraint that controls which cloud services
2727
* can be activated across an organization, or whether a Compute Engine instance
2828
* can have serial port connections established. `Constraints` can be configured
29-
* by the organization's policy adminstrator to fit the needs of the organzation
30-
* by setting a `policy` that includes `constraints` at different locations in
31-
* the organization's resource hierarchy. Policies are inherited down the
32-
* resource hierarchy from higher levels, but can also be overridden. For
33-
* details about the inheritance rules please read about
29+
* by the organization's policy administrator to fit the needs of the
30+
* organization by setting a `policy` that includes `constraints` at different
31+
* locations in the organization's resource hierarchy. Policies are inherited
32+
* down the resource hierarchy from higher levels, but can also be overridden.
33+
* For details about the inheritance rules please read about
3434
* [`policies`][google.cloud.OrgPolicy.v2.Policy].
3535
* `Constraints` have a default behavior determined by the `constraint_default`
3636
* field, which is the enforcement behavior that is used in the absence of a
@@ -2082,11 +2082,11 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
20822082
* example, you could enforce a constraint that controls which cloud services
20832083
* can be activated across an organization, or whether a Compute Engine instance
20842084
* can have serial port connections established. `Constraints` can be configured
2085-
* by the organization's policy adminstrator to fit the needs of the organzation
2086-
* by setting a `policy` that includes `constraints` at different locations in
2087-
* the organization's resource hierarchy. Policies are inherited down the
2088-
* resource hierarchy from higher levels, but can also be overridden. For
2089-
* details about the inheritance rules please read about
2085+
* by the organization's policy administrator to fit the needs of the
2086+
* organization by setting a `policy` that includes `constraints` at different
2087+
* locations in the organization's resource hierarchy. Policies are inherited
2088+
* down the resource hierarchy from higher levels, but can also be overridden.
2089+
* For details about the inheritance rules please read about
20902090
* [`policies`][google.cloud.OrgPolicy.v2.Policy].
20912091
* `Constraints` have a default behavior determined by the `constraint_default`
20922092
* field, which is the enforcement behavior that is used in the absence of a

‎proto-google-cloud-orgpolicy-v2/src/main/java/com/google/cloud/orgpolicy/v2/OrgPolicyProto.java‎

Lines changed: 96 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -99,103 +99,104 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
9999
+ "google/api/resource.proto\032*google/cloud/"
100100
+ "orgpolicy/v2/constraint.proto\032\033google/pr"
101101
+ "otobuf/empty.proto\032\037google/protobuf/time"
102-
+ "stamp.proto\032\026google/type/expr.proto\"\265\002\n\006"
102+
+ "stamp.proto\032\026google/type/expr.proto\"\271\002\n\006"
103103
+ "Policy\022\021\n\004name\030\001 \001(\tB\003\340A\005\0223\n\004spec\030\002 \001(\0132"
104-
+ "%.google.cloud.orgpolicy.v2.PolicySpec\022A"
104+
+ "%.google.cloud.orgpolicy.v2.PolicySpec\022E"
105105
+ "\n\talternate\030\003 \001(\0132..google.cloud.orgpoli"
106-
+ "cy.v2.AlternatePolicySpec:\237\001\352A\233\001\n\037orgpol"
107-
+ "icy.googleapis.com/Policy\022$projects/{pro"
108-
+ "ject}/policies/{policy}\022\"folders/{folder"
109-
+ "}/policies/{policy}\022.organizations/{orga"
110-
+ "nization}/policies/{policy}\"Z\n\023Alternate"
111-
+ "PolicySpec\022\016\n\006launch\030\001 \001(\t\0223\n\004spec\030\002 \001(\013"
112-
+ "2%.google.cloud.orgpolicy.v2.PolicySpec\""
113-
+ "\306\003\n\nPolicySpec\022\014\n\004etag\030\001 \001(\t\0224\n\013update_t"
114-
+ "ime\030\002 \001(\0132\032.google.protobuf.TimestampB\003\340"
115-
+ "A\003\022?\n\005rules\030\003 \003(\01320.google.cloud.orgpoli"
116-
+ "cy.v2.PolicySpec.PolicyRule\022\033\n\023inherit_f"
117-
+ "rom_parent\030\004 \001(\010\022\r\n\005reset\030\005 \001(\010\032\206\002\n\nPoli"
118-
+ "cyRule\022O\n\006values\030\001 \001(\0132=.google.cloud.or"
119-
+ "gpolicy.v2.PolicySpec.PolicyRule.StringV"
120-
+ "aluesH\000\022\023\n\tallow_all\030\002 \001(\010H\000\022\022\n\010deny_all"
121-
+ "\030\003 \001(\010H\000\022\021\n\007enforce\030\004 \001(\010H\000\022$\n\tcondition"
122-
+ "\030\005 \001(\0132\021.google.type.Expr\032=\n\014StringValue"
123-
+ "s\022\026\n\016allowed_values\030\001 \003(\t\022\025\n\rdenied_valu"
124-
+ "es\030\002 \003(\tB\006\n\004kind\"|\n\026ListConstraintsReque"
125-
+ "st\022;\n\006parent\030\001 \001(\tB+\340A\002\372A%\022#orgpolicy.go"
126-
+ "ogleapis.com/Constraint\022\021\n\tpage_size\030\002 \001"
127-
+ "(\005\022\022\n\npage_token\030\003 \001(\t\"n\n\027ListConstraint"
128-
+ "sResponse\022:\n\013constraints\030\001 \003(\0132%.google."
129-
+ "cloud.orgpolicy.v2.Constraint\022\027\n\017next_pa"
130-
+ "ge_token\030\002 \001(\t\"u\n\023ListPoliciesRequest\0227\n"
131-
+ "\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037orgpolicy.googlea"
132-
+ "pis.com/Policy\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npag"
133-
+ "e_token\030\003 \001(\t\"d\n\024ListPoliciesResponse\0223\n"
134-
+ "\010policies\030\001 \003(\0132!.google.cloud.orgpolicy"
135-
+ ".v2.Policy\022\027\n\017next_page_token\030\002 \001(\t\"I\n\020G"
136-
+ "etPolicyRequest\0225\n\004name\030\001 \001(\tB\'\340A\002\372A!\n\037o"
137-
+ "rgpolicy.googleapis.com/Policy\"R\n\031GetEff"
138-
+ "ectivePolicyRequest\0225\n\004name\030\001 \001(\tB\'\340A\002\372A"
139-
+ "!\n\037orgpolicy.googleapis.com/Policy\"\206\001\n\023C"
140-
+ "reatePolicyRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372"
141-
+ "A!\022\037orgpolicy.googleapis.com/Policy\0226\n\006p"
142-
+ "olicy\030\003 \001(\0132!.google.cloud.orgpolicy.v2."
143-
+ "PolicyB\003\340A\002\"M\n\023UpdatePolicyRequest\0226\n\006po"
144-
+ "licy\030\001 \001(\0132!.google.cloud.orgpolicy.v2.P"
145-
+ "olicyB\003\340A\002\"L\n\023DeletePolicyRequest\0225\n\004nam"
146-
+ "e\030\001 \001(\tB\'\340A\002\372A!\n\037orgpolicy.googleapis.co"
147-
+ "m/Policy2\275\016\n\tOrgPolicy\022\201\002\n\017ListConstrain"
148-
+ "ts\0221.google.cloud.orgpolicy.v2.ListConst"
149-
+ "raintsRequest\0322.google.cloud.orgpolicy.v"
150-
+ "2.ListConstraintsResponse\"\206\001\202\323\344\223\002w\022#/v2/"
151-
+ "{parent=projects/*}/constraintsZ$\022\"/v2/{"
152-
+ "parent=folders/*}/constraintsZ*\022(/v2/{pa"
153-
+ "rent=organizations/*}/constraints\332A\006pare"
154-
+ "nt\022\356\001\n\014ListPolicies\022..google.cloud.orgpo"
155-
+ "licy.v2.ListPoliciesRequest\032/.google.clo"
156-
+ "ud.orgpolicy.v2.ListPoliciesResponse\"}\202\323"
157-
+ "\344\223\002n\022 /v2/{parent=projects/*}/policiesZ!"
158-
+ "\022\037/v2/{parent=folders/*}/policiesZ\'\022%/v2"
159-
+ "/{parent=organizations/*}/policies\332A\006par"
160-
+ "ent\022\330\001\n\tGetPolicy\022+.google.cloud.orgpoli"
161-
+ "cy.v2.GetPolicyRequest\032!.google.cloud.or"
162-
+ "gpolicy.v2.Policy\"{\202\323\344\223\002n\022 /v2/{name=pro"
163-
+ "jects/*/policies/*}Z!\022\037/v2/{name=folders"
164-
+ "/*/policies/*}Z\'\022%/v2/{name=organization"
165-
+ "s/*/policies/*}\332A\004name\022\245\002\n\022GetEffectiveP"
166-
+ "olicy\0224.google.cloud.orgpolicy.v2.GetEff"
167-
+ "ectivePolicyRequest\032!.google.cloud.orgpo"
168-
+ "licy.v2.Policy\"\265\001\202\323\344\223\002\247\001\0223/v2/{name=proj"
169-
+ "ects/*/policies/*}:getEffectivePolicyZ4\022"
170-
+ "2/v2/{name=folders/*/policies/*}:getEffe"
171-
+ "ctivePolicyZ:\0228/v2/{name=organizations/*"
172-
+ "/policies/*}:getEffectivePolicy\332A\004name\022\201"
173-
+ "\002\n\014CreatePolicy\022..google.cloud.orgpolicy"
174-
+ ".v2.CreatePolicyRequest\032!.google.cloud.o"
175-
+ "rgpolicy.v2.Policy\"\235\001\202\323\344\223\002\206\001\" /v2/{paren"
176-
+ "t=projects/*}/policies:\006policyZ)\"\037/v2/{p"
177-
+ "arent=folders/*}/policies:\006policyZ/\"%/v2"
178-
+ "/{parent=organizations/*}/policies:\006poli"
179-
+ "cy\332A\rparent,policy\022\217\002\n\014UpdatePolicy\022..go"
180-
+ "ogle.cloud.orgpolicy.v2.UpdatePolicyRequ"
181-
+ "est\032!.google.cloud.orgpolicy.v2.Policy\"\253"
182-
+ "\001\202\323\344\223\002\233\0012\'/v2/{policy.name=projects/*/po"
183-
+ "licies/*}:\006policyZ02&/v2/{policy.name=fo"
184-
+ "lders/*/policies/*}:\006policyZ62,/v2/{poli"
185-
+ "cy.name=organizations/*/policies/*}:\006pol"
186-
+ "icy\332A\006policy\022\323\001\n\014DeletePolicy\022..google.c"
187-
+ "loud.orgpolicy.v2.DeletePolicyRequest\032\026."
188-
+ "google.protobuf.Empty\"{\202\323\344\223\002n* /v2/{name"
189-
+ "=projects/*/policies/*}Z!*\037/v2/{name=fol"
190-
+ "ders/*/policies/*}Z\'*%/v2/{name=organiza"
191-
+ "tions/*/policies/*}\332A\004name\032L\312A\030orgpolicy"
192-
+ ".googleapis.com\322A.https://www.googleapis"
193-
+ ".com/auth/cloud-platformB\314\001\n\035com.google."
194-
+ "cloud.orgpolicy.v2B\016OrgPolicyProtoP\001ZBgo"
195-
+ "ogle.golang.org/genproto/googleapis/clou"
196-
+ "d/orgpolicy/v2;orgpolicy\252\002\031Google.Cloud."
197-
+ "OrgPolicy.V2\312\002\031Google\\Cloud\\OrgPolicy\\V2"
198-
+ "\352\002\034Google::Cloud::OrgPolicy::V2b\006proto3"
106+
+ "cy.v2.AlternatePolicySpecB\002\030\001:\237\001\352A\233\001\n\037or"
107+
+ "gpolicy.googleapis.com/Policy\022$projects/"
108+
+ "{project}/policies/{policy}\022\"folders/{fo"
109+
+ "lder}/policies/{policy}\022.organizations/{"
110+
+ "organization}/policies/{policy}\"Z\n\023Alter"
111+
+ "natePolicySpec\022\016\n\006launch\030\001 \001(\t\0223\n\004spec\030\002"
112+
+ " \001(\0132%.google.cloud.orgpolicy.v2.PolicyS"
113+
+ "pec\"\306\003\n\nPolicySpec\022\014\n\004etag\030\001 \001(\t\0224\n\013upda"
114+
+ "te_time\030\002 \001(\0132\032.google.protobuf.Timestam"
115+
+ "pB\003\340A\003\022?\n\005rules\030\003 \003(\01320.google.cloud.org"
116+
+ "policy.v2.PolicySpec.PolicyRule\022\033\n\023inher"
117+
+ "it_from_parent\030\004 \001(\010\022\r\n\005reset\030\005 \001(\010\032\206\002\n\n"
118+
+ "PolicyRule\022O\n\006values\030\001 \001(\0132=.google.clou"
119+
+ "d.orgpolicy.v2.PolicySpec.PolicyRule.Str"
120+
+ "ingValuesH\000\022\023\n\tallow_all\030\002 \001(\010H\000\022\022\n\010deny"
121+
+ "_all\030\003 \001(\010H\000\022\021\n\007enforce\030\004 \001(\010H\000\022$\n\tcondi"
122+
+ "tion\030\005 \001(\0132\021.google.type.Expr\032=\n\014StringV"
123+
+ "alues\022\026\n\016allowed_values\030\001 \003(\t\022\025\n\rdenied_"
124+
+ "values\030\002 \003(\tB\006\n\004kind\"|\n\026ListConstraintsR"
125+
+ "equest\022;\n\006parent\030\001 \001(\tB+\340A\002\372A%\022#orgpolic"
126+
+ "y.googleapis.com/Constraint\022\021\n\tpage_size"
127+
+ "\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"n\n\027ListConstr"
128+
+ "aintsResponse\022:\n\013constraints\030\001 \003(\0132%.goo"
129+
+ "gle.cloud.orgpolicy.v2.Constraint\022\027\n\017nex"
130+
+ "t_page_token\030\002 \001(\t\"u\n\023ListPoliciesReques"
131+
+ "t\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037orgpolicy.goo"
132+
+ "gleapis.com/Policy\022\021\n\tpage_size\030\002 \001(\005\022\022\n"
133+
+ "\npage_token\030\003 \001(\t\"d\n\024ListPoliciesRespons"
134+
+ "e\0223\n\010policies\030\001 \003(\0132!.google.cloud.orgpo"
135+
+ "licy.v2.Policy\022\027\n\017next_page_token\030\002 \001(\t\""
136+
+ "I\n\020GetPolicyRequest\0225\n\004name\030\001 \001(\tB\'\340A\002\372A"
137+
+ "!\n\037orgpolicy.googleapis.com/Policy\"R\n\031Ge"
138+
+ "tEffectivePolicyRequest\0225\n\004name\030\001 \001(\tB\'\340"
139+
+ "A\002\372A!\n\037orgpolicy.googleapis.com/Policy\"\206"
140+
+ "\001\n\023CreatePolicyRequest\0227\n\006parent\030\001 \001(\tB\'"
141+
+ "\340A\002\372A!\022\037orgpolicy.googleapis.com/Policy\022"
142+
+ "6\n\006policy\030\003 \001(\0132!.google.cloud.orgpolicy"
143+
+ ".v2.PolicyB\003\340A\002\"M\n\023UpdatePolicyRequest\0226"
144+
+ "\n\006policy\030\001 \001(\0132!.google.cloud.orgpolicy."
145+
+ "v2.PolicyB\003\340A\002\"L\n\023DeletePolicyRequest\0225\n"
146+
+ "\004name\030\001 \001(\tB\'\340A\002\372A!\n\037orgpolicy.googleapi"
147+
+ "s.com/Policy2\275\016\n\tOrgPolicy\022\201\002\n\017ListConst"
148+
+ "raints\0221.google.cloud.orgpolicy.v2.ListC"
149+
+ "onstraintsRequest\0322.google.cloud.orgpoli"
150+
+ "cy.v2.ListConstraintsResponse\"\206\001\202\323\344\223\002w\022#"
151+
+ "/v2/{parent=projects/*}/constraintsZ$\022\"/"
152+
+ "v2/{parent=folders/*}/constraintsZ*\022(/v2"
153+
+ "/{parent=organizations/*}/constraints\332A\006"
154+
+ "parent\022\356\001\n\014ListPolicies\022..google.cloud.o"
155+
+ "rgpolicy.v2.ListPoliciesRequest\032/.google"
156+
+ ".cloud.orgpolicy.v2.ListPoliciesResponse"
157+
+ "\"}\202\323\344\223\002n\022 /v2/{parent=projects/*}/polici"
158+
+ "esZ!\022\037/v2/{parent=folders/*}/policiesZ\'\022"
159+
+ "%/v2/{parent=organizations/*}/policies\332A"
160+
+ "\006parent\022\330\001\n\tGetPolicy\022+.google.cloud.org"
161+
+ "policy.v2.GetPolicyRequest\032!.google.clou"
162+
+ "d.orgpolicy.v2.Policy\"{\202\323\344\223\002n\022 /v2/{name"
163+
+ "=projects/*/policies/*}Z!\022\037/v2/{name=fol"
164+
+ "ders/*/policies/*}Z\'\022%/v2/{name=organiza"
165+
+ "tions/*/policies/*}\332A\004name\022\245\002\n\022GetEffect"
166+
+ "ivePolicy\0224.google.cloud.orgpolicy.v2.Ge"
167+
+ "tEffectivePolicyRequest\032!.google.cloud.o"
168+
+ "rgpolicy.v2.Policy\"\265\001\202\323\344\223\002\247\001\0223/v2/{name="
169+
+ "projects/*/policies/*}:getEffectivePolic"
170+
+ "yZ4\0222/v2/{name=folders/*/policies/*}:get"
171+
+ "EffectivePolicyZ:\0228/v2/{name=organizatio"
172+
+ "ns/*/policies/*}:getEffectivePolicy\332A\004na"
173+
+ "me\022\201\002\n\014CreatePolicy\022..google.cloud.orgpo"
174+
+ "licy.v2.CreatePolicyRequest\032!.google.clo"
175+
+ "ud.orgpolicy.v2.Policy\"\235\001\202\323\344\223\002\206\001\" /v2/{p"
176+
+ "arent=projects/*}/policies:\006policyZ)\"\037/v"
177+
+ "2/{parent=folders/*}/policies:\006policyZ/\""
178+
+ "%/v2/{parent=organizations/*}/policies:\006"
179+
+ "policy\332A\rparent,policy\022\217\002\n\014UpdatePolicy\022"
180+
+ "..google.cloud.orgpolicy.v2.UpdatePolicy"
181+
+ "Request\032!.google.cloud.orgpolicy.v2.Poli"
182+
+ "cy\"\253\001\202\323\344\223\002\233\0012\'/v2/{policy.name=projects/"
183+
+ "*/policies/*}:\006policyZ02&/v2/{policy.nam"
184+
+ "e=folders/*/policies/*}:\006policyZ62,/v2/{"
185+
+ "policy.name=organizations/*/policies/*}:"
186+
+ "\006policy\332A\006policy\022\323\001\n\014DeletePolicy\022..goog"
187+
+ "le.cloud.orgpolicy.v2.DeletePolicyReques"
188+
+ "t\032\026.google.protobuf.Empty\"{\202\323\344\223\002n* /v2/{"
189+
+ "name=projects/*/policies/*}Z!*\037/v2/{name"
190+
+ "=folders/*/policies/*}Z\'*%/v2/{name=orga"
191+
+ "nizations/*/policies/*}\332A\004name\032L\312A\030orgpo"
192+
+ "licy.googleapis.com\322A.https://www.google"
193+
+ "apis.com/auth/cloud-platformB\314\001\n\035com.goo"
194+
+ "gle.cloud.orgpolicy.v2B\016OrgPolicyProtoP\001"
195+
+ "ZBgoogle.golang.org/genproto/googleapis/"
196+
+ "cloud/orgpolicy/v2;orgpolicy\252\002\031Google.Cl"
197+
+ "oud.OrgPolicy.V2\312\002\031Google\\Cloud\\OrgPolic"
198+
+ "y\\V2\352\002\034Google::Cloud::OrgPolicy::V2b\006pro"
199+
+ "to3"
199200
};
200201
descriptor =
201202
com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(

0 commit comments

Comments
 (0)