Skip to content

Commit b09e794

Browse files
committed
2 parents d9bddea + 4134d93 commit b09e794

4 files changed

Lines changed: 25 additions & 8 deletions

File tree

mmv1/products/iambeta/WorkloadIdentityPool.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,15 @@ properties:
277277
PEM certificate of the PKI used for validation. Must only contain one ca
278278
certificate(either root or intermediate cert).
279279
required: true
280+
- name: 'trustDefaultSharedCa'
281+
type: Boolean
282+
description: |
283+
If set to True, the trust bundle will include the private ca managed identity regional root
284+
public certificates.
285+
286+
287+
~> **Note** `trust_default_shared_ca` is only supported for managed identity trust domain
288+
resource.
280289
- name: 'attestationRules'
281290
is_missing_in_cai: true
282291
type: Array

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
1515
}
1616
inline_trust_config {
1717
additional_trust_bundles {
18-
trust_domain = "example.com"
18+
trust_domain = "example.com"
19+
trust_default_shared_ca = false
1920
trust_anchors {
2021
pem_certificate = file("test-fixtures/trust_anchor_1.pem")
2122
}
@@ -24,7 +25,8 @@ resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
2425
}
2526
}
2627
additional_trust_bundles {
27-
trust_domain = "example.net"
28+
trust_domain = "example.net"
29+
trust_default_shared_ca = false
2830
trust_anchors {
2931
pem_certificate = file("test-fixtures/trust_anchor_3.pem")
3032
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
1212
}
1313
inline_trust_config {
1414
additional_trust_bundles {
15-
trust_domain = "example.com"
15+
trust_domain = "example.com"
16+
trust_default_shared_ca = true
1617
trust_anchors {
1718
pem_certificate = file("test-fixtures/trust_anchor_1.pem")
1819
}
@@ -21,7 +22,8 @@ resource "google_iam_workload_identity_pool" "{{$.PrimaryResourceId}}" {
2122
}
2223
}
2324
additional_trust_bundles {
24-
trust_domain = "example.net"
25+
trust_domain = "example.net"
26+
trust_default_shared_ca = true
2527
trust_anchors {
2628
pem_certificate = file("test-fixtures/trust_anchor_3.pem")
2729
}

mmv1/third_party/terraform/services/iambeta/resource_iam_workload_identity_pool_test.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ resource "google_iam_workload_identity_pool" "my_pool" {
159159
}
160160
inline_trust_config {
161161
additional_trust_bundles {
162-
trust_domain = "ca-pool-foo.global.project-foo.workload.id.goog"
162+
trust_domain = "ca-pool-foo.global.project-foo.workload.id.goog"
163+
trust_default_shared_ca = false
163164
trust_anchors {
164165
pem_certificate = file("test-fixtures/trust_anchor_1.pem")
165166
}
@@ -168,7 +169,8 @@ resource "google_iam_workload_identity_pool" "my_pool" {
168169
}
169170
}
170171
additional_trust_bundles {
171-
trust_domain = "ca-pool-bar.global.project-bar.workload.id.goog"
172+
trust_domain = "ca-pool-bar.global.project-bar.workload.id.goog"
173+
trust_default_shared_ca = false
172174
trust_anchors {
173175
pem_certificate = file("test-fixtures/trust_anchor_3.pem")
174176
}
@@ -203,7 +205,8 @@ resource "google_iam_workload_identity_pool" "my_pool" {
203205
}
204206
inline_trust_config {
205207
additional_trust_bundles {
206-
trust_domain = "ca-pool-baz.global.project-baz.workload.id.goog"
208+
trust_domain = "ca-pool-baz.global.project-baz.workload.id.goog"
209+
trust_default_shared_ca = false
207210
trust_anchors {
208211
pem_certificate = file("test-fixtures/trust_anchor_updated.pem")
209212
}
@@ -238,7 +241,8 @@ resource "google_iam_workload_identity_pool" "my_pool" {
238241
}
239242
inline_trust_config {
240243
additional_trust_bundles {
241-
trust_domain = "ca-pool-baz.global.project-baz.workload.id.goog"
244+
trust_domain = "ca-pool-baz.global.project-baz.workload.id.goog"
245+
trust_default_shared_ca = true
242246
trust_anchors {
243247
pem_certificate = file("test-fixtures/trust_anchor_updated.pem")
244248
}

0 commit comments

Comments
 (0)