Skip to content

Commit 33b9d3d

Browse files
committed
Add support for extra attributes oauth2 client
fields to create workforce pool operation. This address the gap between newly added support in Gcloud command of iam create workforce pool provider and iam update workforce pool provider. Fixes hashicorp/terraform-provider-google#20862 ``` iam: added `extra_attributes_oauth2_client` field to `google_iam_workforce_pool_provider` SAML resource ```
1 parent e2df63b commit 33b9d3d

File tree

4 files changed

+240
-11
lines changed

4 files changed

+240
-11
lines changed

mmv1/products/iamworkforcepool/WorkforcePoolProvider.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ examples:
8080
org_id: 'ORG_ID'
8181
ignore_read_extra:
8282
- 'oidc.0.client_secret.0.value.0.plain_text'
83+
- 'extra_attributes_oauth2_client.0.client_secret.0.value.0.plain_text'
8384
- name: 'iam_workforce_pool_provider_oidc_upload_key'
8485
primary_resource_id: 'example'
8586
vars:
@@ -388,7 +389,7 @@ properties:
388389
The configuration for OAuth 2.0 client used to get the additional user
389390
attributes. This should be used when users can't get the desired claims
390391
in authentication credentials. Currently this configuration is only
391-
supported with OIDC protocol.
392+
supported with SAML and OIDC protocol.
392393
properties:
393394
- name: 'issuerUri'
394395
type: String

mmv1/templates/terraform/examples/iam_workforce_pool_provider_oidc_full.tf.tmpl

+14-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ resource "google_iam_workforce_pool_provider" "{{$.PrimaryResourceId}}" {
1212
"google.subject" = "assertion.sub"
1313
}
1414
oidc {
15-
issuer_uri = "https://accounts.thirdparty.com"
15+
issuer_uri = "https://login.microsoftonline.com/826602fe-2101-470c-9d71-ee1343668989/v2.0"
1616
client_id = "client-id"
1717
client_secret {
1818
value {
@@ -25,6 +25,19 @@ resource "google_iam_workforce_pool_provider" "{{$.PrimaryResourceId}}" {
2525
additional_scopes = ["groups", "roles"]
2626
}
2727
}
28+
extra_attributes_oauth2_client {
29+
issuer_uri = "https://login.microsoftonline.com/826602fe-2101-470c-9d71-ee1343668989/v2.0"
30+
client_id = "client-id"
31+
client_secret {
32+
value {
33+
plain_text = "client-secret"
34+
}
35+
}
36+
attributes_type = "AZURE_AD_GROUPS_MAIL"
37+
query_parameters {
38+
filter = "mail:sales"
39+
}
40+
}
2841
display_name = "Display name"
2942
description = "A sample OIDC workforce pool provider."
3043
disabled = false

mmv1/templates/terraform/examples/iam_workforce_pool_provider_saml_full.tf.tmpl

+13
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,19 @@ resource "google_iam_workforce_pool_provider" "{{$.PrimaryResourceId}}" {
1414
saml {
1515
idp_metadata_xml = "<?xml version=\"1.0\"?><md:EntityDescriptor xmlns:md=\"urn:oasis:names:tc:SAML:2.0:metadata\" entityID=\"https://test.com\"><md:IDPSSODescriptor protocolSupportEnumeration=\"urn:oasis:names:tc:SAML:2.0:protocol\"> <md:KeyDescriptor use=\"signing\"><ds:KeyInfo xmlns:ds=\"http://www.w3.org/2000/09/xmldsig#\"><ds:X509Data><ds:X509Certificate>MIIDpDCCAoygAwIBAgIGAX7/5qPhMA0GCSqGSIb3DQEBCwUAMIGSMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5jaXNjbzENMAsGA1UECgwET2t0YTEUMBIGA1UECwwLU1NPUHJvdmlkZXIxEzARBgNVBAMMCmRldi00NTg0MjExHDAaBgkqhkiG9w0BCQEWDWluZm9Ab2t0YS5jb20wHhcNMjIwMjE2MDAxOTEyWhcNMzIwMjE2MDAyMDEyWjCBkjELMAkGA1UEBhMCVVMxEzARBgNVBAgMCkNhbGlmb3JuaWExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDTALBgNVBAoMBE9rdGExFDASBgNVBAsMC1NTT1Byb3ZpZGVyMRMwEQYDVQQDDApkZXYtNDU4NDIxMRwwGgYJKoZIhvcNAQkBFg1pbmZvQG9rdGEuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxrBl7GKz52cRpxF9xCsirnRuMxnhFBaUrsHqAQrLqWmdlpNYZTVg+T9iQ+aq/iE68L+BRZcZniKIvW58wqqS0ltXVvIkXuDSvnvnkkI5yMIVErR20K8jSOKQm1FmK+fgAJ4koshFiu9oLiqu0Ejc0DuL3/XRsb4RuxjktKTb1khgBBtb+7idEk0sFR0RPefAweXImJkDHDm7SxjDwGJUubbqpdTxasPr0W+AHI1VUzsUsTiHAoyb0XDkYqHfDzhj/ZdIEl4zHQ3bEZvlD984ztAnmX2SuFLLKfXeAAGHei8MMixJvwxYkkPeYZ/5h8WgBZPP4heS2CPjwYExt29L8QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQARjJFz++a9Z5IQGFzsZMrX2EDR5ML4xxUiQkbhld1S1PljOLcYFARDmUC2YYHOueU4ee8Jid9nPGEUebV/4Jok+b+oQh+dWMgiWjSLI7h5q4OYZ3VJtdlVwgMFt2iz+/4yBKMUZ50g3Qgg36vE34us+eKitg759JgCNsibxn0qtJgSPm0sgP2L6yTaLnoEUbXBRxCwynTSkp9ZijZqEzbhN0e2dWv7Rx/nfpohpDP6vEiFImKFHpDSv3M/5de1ytQzPFrZBYt9WlzlYwE1aD9FHCxdd+rWgYMVVoRaRmndpV/Rq3QUuDuFJtaoX11bC7ExkOpg9KstZzA63i3VcfYv</ds:X509Certificate></ds:X509Data></ds:KeyInfo></md:KeyDescriptor><md:SingleSignOnService Binding=\"urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect\" Location=\"https://test.com/sso\"/></md:IDPSSODescriptor></md:EntityDescriptor>"
1616
}
17+
extra_attributes_oauth2_client {
18+
issuer_uri = "https://login.microsoftonline.com/826602fe-2101-470c-9d71-ee1343668989/v2.0"
19+
client_id = "client-id"
20+
client_secret {
21+
value {
22+
plain_text = "client-secret"
23+
}
24+
}
25+
attributes_type = "AZURE_AD_GROUPS_MAIL"
26+
query_parameters {
27+
filter = "mail:gcp"
28+
}
29+
}
1730
display_name = "Display name"
1831
description = "A sample SAML workforce pool provider."
1932
disabled = false

0 commit comments

Comments
 (0)