diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/apigee/apigeeenvironment.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/apigee/apigeeenvironment.md index 11d33b799e..cead74b2cb 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/apigee/apigeeenvironment.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/apigee/apigeeenvironment.md @@ -55,7 +55,7 @@ organizations.environments IAMPolicy/IAMPartialPolicy Supports Conditions - Yes + No IAMPolicyMember Supports Conditions diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampartialpolicy.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampartialpolicy.md index edb2fa56da..ad1a271423 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampartialpolicy.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampartialpolicy.md @@ -113,7 +113,7 @@ resources using `IAMPolicy`, `IAMPartialPolicy`, and `IAMPolicyMember` since ApigeeEnvironment - Y + ArtifactRegistryRepository diff --git a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampolicy.md b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampolicy.md index d6f4bf3c64..0948d097ab 100644 --- a/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampolicy.md +++ b/scripts/generate-google3-docs/resource-reference/generated/resource-docs/iam/iampolicy.md @@ -116,7 +116,7 @@ resources using `IAMPolicy`, `IAMPartialPolicy`, and `IAMPolicyMember` since ApigeeEnvironment - Y + diff --git a/scripts/generate-google3-docs/resource-reference/main.go b/scripts/generate-google3-docs/resource-reference/main.go index 465404819a..ebe13556ea 100644 --- a/scripts/generate-google3-docs/resource-reference/main.go +++ b/scripts/generate-google3-docs/resource-reference/main.go @@ -372,6 +372,11 @@ func handleAnnotationsAndIAMSettingsForDCLBasedResource(r *resource, gvk schema. SupportsAuditConfigs: false, // No DCL-based resources support AuditConfigs. ExternalReferenceFormats: []string{externalReferenceFormat}, } + // Apigee Environment does not support conditional IAM permissions + // Ref: https://b.corp.google.com/issues/378594862#comment6 + if gvk.Group == "apigee.cnrm.cloud.google.com" && gvk.Kind == "ApigeeEnvironment" { + r.IAM.SupportsConditions = false + } return nil } @@ -669,7 +674,7 @@ func (d *DocGenerator) referencesSupportedByIAMPolicy() ([]iamPolicyReference, e if externalReferenceFormat == "" { // Resource does not support IAM. continue } - refs = append(refs, iamPolicyReference{ + r := iamPolicyReference{ Kind: gvk.Kind, IsDCLBased: true, // DCL-based resources support conditions on IAMPolicy but do not support it @@ -678,7 +683,13 @@ func (d *DocGenerator) referencesSupportedByIAMPolicy() ([]iamPolicyReference, e SupportsConditions: true, SupportsAuditConfigs: false, // No DCL-based resources support AuditConfigs. ExternalReferenceFormats: []string{externalReferenceFormat}, - }) + } + // Apigee Environment does not support conditional IAM permissions + // Ref: https://b.corp.google.com/issues/378594862#comment6 + if gvk.Group == "apigee.cnrm.cloud.google.com" && gvk.Kind == "ApigeeEnvironment" { + r.SupportsConditions = false + } + refs = append(refs, r) } for gvk, extOnlyType := range kcciamclient.ExternalOnlyTypes { refs = append(refs, iamPolicyReference{ diff --git a/scripts/generate-google3-docs/resource-reference/templates/shared/iamsupport.tmpl b/scripts/generate-google3-docs/resource-reference/templates/shared/iamsupport.tmpl index 96f3fe8fb6..790eb965d6 100644 --- a/scripts/generate-google3-docs/resource-reference/templates/shared/iamsupport.tmpl +++ b/scripts/generate-google3-docs/resource-reference/templates/shared/iamsupport.tmpl @@ -6,7 +6,7 @@ {{ if.IAM.IsDCLBased}} IAMPolicy/IAMPartialPolicy Supports Conditions - Yes + {{ if.IAM.SupportsConditions}}Yes{{else}}No{{end}} IAMPolicyMember Supports Conditions