Skip to content

Commit 08f6cf9

Browse files
modular-magicianmodular-magician
authored
Fixes #19540 (#12253) (#20234)
[upstream:3db026ca076c34e112178ab9c5e5a6a7fb251e8b] Signed-off-by: Modular Magician <[email protected]>
1 parent 45df35f commit 08f6cf9

13 files changed

+73
-42
lines changed

‎.changelog/12253.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeter.go

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,11 @@ a perimeter bridge.`,
565565
"identities": {
566566
Type: schema.TypeSet,
567567
Optional: true,
568-
Description: `A list of identities that are allowed access through this 'EgressPolicy'.
569-
Should be in the format of email address. The email address should
570-
represent individual user or service account only.`,
568+
Description: `Identities can be an individual user, service account, Google group,
569+
or third-party identity. For third-party identity, only single identities
570+
are supported and other identity types are not supported.The v1 identities
571+
that have the prefix user, group and serviceAccount in
572+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
571573
Elem: &schema.Schema{
572574
Type: schema.TypeString,
573575
},
@@ -705,9 +707,11 @@ to apply.`,
705707
"identities": {
706708
Type: schema.TypeSet,
707709
Optional: true,
708-
Description: `A list of identities that are allowed access through this ingress policy.
709-
Should be in the format of email address. The email address should represent
710-
individual user or service account only.`,
710+
Description: `Identities can be an individual user, service account, Google group,
711+
or third-party identity. For third-party identity, only single identities
712+
are supported and other identity types are not supported.The v1 identities
713+
that have the prefix user, group and serviceAccount in
714+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
711715
Elem: &schema.Schema{
712716
Type: schema.TypeString,
713717
},

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_egress_policy.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ func ResourceAccessContextManagerServicePerimeterDryRunEgressPolicy() *schema.Re
114114
Type: schema.TypeList,
115115
Optional: true,
116116
ForceNew: true,
117-
Description: `A list of identities that are allowed access through this 'EgressPolicy'.
118-
Should be in the format of email address. The email address should
119-
represent individual user or service account only.`,
117+
Description: `Identities can be an individual user, service account, Google group,
118+
or third-party identity. For third-party identity, only single identities
119+
are supported and other identity types are not supported.The v1 identities
120+
that have the prefix user, group and serviceAccount in
121+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
120122
Elem: &schema.Schema{
121123
Type: schema.TypeString,
122124
},

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_dry_run_ingress_policy.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,11 @@ to apply.`,
115115
Type: schema.TypeList,
116116
Optional: true,
117117
ForceNew: true,
118-
Description: `A list of identities that are allowed access through this ingress policy.
119-
Should be in the format of email address. The email address should represent
120-
individual user or service account only.`,
118+
Description: `Identities can be an individual user, service account, Google group,
119+
or third-party identity. For third-party identity, only single identities
120+
are supported and other identity types are not supported.The v1 identities
121+
that have the prefix user, group and serviceAccount in
122+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
121123
Elem: &schema.Schema{
122124
Type: schema.TypeString,
123125
},

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_egress_policy.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,11 @@ func ResourceAccessContextManagerServicePerimeterEgressPolicy() *schema.Resource
114114
Type: schema.TypeList,
115115
Optional: true,
116116
ForceNew: true,
117-
Description: `A list of identities that are allowed access through this 'EgressPolicy'.
118-
Should be in the format of email address. The email address should
119-
represent individual user or service account only.`,
117+
Description: `Identities can be an individual user, service account, Google group,
118+
or third-party identity. For third-party identity, only single identities
119+
are supported and other identity types are not supported.The v1 identities
120+
that have the prefix user, group and serviceAccount in
121+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
120122
Elem: &schema.Schema{
121123
Type: schema.TypeString,
122124
},

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeter_ingress_policy.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,11 @@ to apply.`,
115115
Type: schema.TypeList,
116116
Optional: true,
117117
ForceNew: true,
118-
Description: `A list of identities that are allowed access through this ingress policy.
119-
Should be in the format of email address. The email address should represent
120-
individual user or service account only.`,
118+
Description: `Identities can be an individual user, service account, Google group,
119+
or third-party identity. For third-party identity, only single identities
120+
are supported and other identity types are not supported.The v1 identities
121+
that have the prefix user, group and serviceAccount in
122+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
121123
Elem: &schema.Schema{
122124
Type: schema.TypeString,
123125
},

‎google/services/accesscontextmanager/resource_access_context_manager_service_perimeters.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,11 @@ a perimeter bridge.`,
151151
"identities": {
152152
Type: schema.TypeSet,
153153
Optional: true,
154-
Description: `A list of identities that are allowed access through this 'EgressPolicy'.
155-
Should be in the format of email address. The email address should
156-
represent individual user or service account only.`,
154+
Description: `Identities can be an individual user, service account, Google group,
155+
or third-party identity. For third-party identity, only single identities
156+
are supported and other identity types are not supported.The v1 identities
157+
that have the prefix user, group and serviceAccount in
158+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.`,
157159
Elem: &schema.Schema{
158160
Type: schema.TypeString,
159161
},

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -390,9 +390,11 @@ The following arguments are supported:
390390

391391
* `identities` -
392392
(Optional)
393-
A list of identities that are allowed access through this ingress policy.
394-
Should be in the format of email address. The email address should represent
395-
individual user or service account only.
393+
Identities can be an individual user, service account, Google group,
394+
or third-party identity. For third-party identity, only single identities
395+
are supported and other identity types are not supported.The v1 identities
396+
that have the prefix user, group and serviceAccount in
397+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.
396398

397399
* `sources` -
398400
(Optional)
@@ -510,9 +512,11 @@ The following arguments are supported:
510512

511513
* `identities` -
512514
(Optional)
513-
A list of identities that are allowed access through this `EgressPolicy`.
514-
Should be in the format of email address. The email address should
515-
represent individual user or service account only.
515+
Identities can be an individual user, service account, Google group,
516+
or third-party identity. For third-party identity, only single identities
517+
are supported and other identity types are not supported.The v1 identities
518+
that have the prefix user, group and serviceAccount in
519+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.
516520

517521

518522
<a name="nested_sources"></a>The `sources` block supports:

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,11 @@ The following arguments are supported:
117117

118118
* `identities` -
119119
(Optional)
120-
A list of identities that are allowed access through this `EgressPolicy`.
121-
Should be in the format of email address. The email address should
122-
represent individual user or service account only.
120+
Identities can be an individual user, service account, Google group,
121+
or third-party identity. For third-party identity, only single identities
122+
are supported and other identity types are not supported.The v1 identities
123+
that have the prefix user, group and serviceAccount in
124+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.
123125

124126
* `sources` -
125127
(Optional)

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,11 @@ The following arguments are supported:
122122

123123
* `identities` -
124124
(Optional)
125-
A list of identities that are allowed access through this ingress policy.
126-
Should be in the format of email address. The email address should represent
127-
individual user or service account only.
125+
Identities can be an individual user, service account, Google group,
126+
or third-party identity. For third-party identity, only single identities
127+
are supported and other identity types are not supported.The v1 identities
128+
that have the prefix user, group and serviceAccount in
129+
https://cloud.google.com/iam/docs/principal-identifiers#v1 are supported.
128130

129131
* `sources` -
130132
(Optional)

0 commit comments

Comments
 (0)