Skip to content

Commit 66c44fb

Browse files
Fix subordinate CA creation with max_issuer_path_legth = 0 (#5107) (#3540)
* fix max_issuer_path_legth = 0 issue * fix maxIssuerPathLength for pools too Signed-off-by: Modular Magician <[email protected]>
1 parent 710609b commit 66c44fb

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

.changelog/5107.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
privateca: fixed the creation of subordinate `google_privateca_certificate_authority` with `max_issuer_path_length = 0`.
3+
```

google-beta/resource_dataproc_cluster_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1414
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1515

16-
"google.golang.org/api/googleapi"
17-
1816
dataproc "google.golang.org/api/dataproc/v1beta2"
17+
"google.golang.org/api/googleapi"
1918
)
2019

2120
func TestDataprocExtractInitTimeout(t *testing.T) {

google-beta/resource_privateca_ca_pool.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1408,7 +1408,7 @@ func expandPrivatecaCaPoolIssuancePolicyBaselineValuesCaOptions(v interface{}, d
14081408
transformedMaxIssuerPathLength, err := expandPrivatecaCaPoolIssuancePolicyBaselineValuesCaOptionsMaxIssuerPathLength(original["max_issuer_path_length"], d, config)
14091409
if err != nil {
14101410
return nil, err
1411-
} else if val := reflect.ValueOf(transformedMaxIssuerPathLength); val.IsValid() && !isEmptyValue(val) {
1411+
} else {
14121412
transformed["maxIssuerPathLength"] = transformedMaxIssuerPathLength
14131413
}
14141414

google-beta/resource_privateca_certificate_authority.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ func expandPrivatecaCertificateAuthorityConfigX509ConfigCaOptions(v interface{},
13181318
transformedMaxIssuerPathLength, err := expandPrivatecaCertificateAuthorityConfigX509ConfigCaOptionsMaxIssuerPathLength(original["max_issuer_path_length"], d, config)
13191319
if err != nil {
13201320
return nil, err
1321-
} else if val := reflect.ValueOf(transformedMaxIssuerPathLength); val.IsValid() && !isEmptyValue(val) {
1321+
} else {
13221322
transformed["maxIssuerPathLength"] = transformedMaxIssuerPathLength
13231323
}
13241324

google-beta/resource_privateca_certificate_authority_generated_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,8 @@ resource "google_privateca_certificate_authority" "default" {
150150
x509_config {
151151
ca_options {
152152
is_ca = true
153-
max_issuer_path_length = 10
153+
# Force the sub CA to only issue leaf certs
154+
max_issuer_path_length = 0
154155
}
155156
key_usage {
156157
base_key_usage {

website/docs/r/privateca_certificate_authority.html.markdown

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,8 @@ resource "google_privateca_certificate_authority" "default" {
117117
x509_config {
118118
ca_options {
119119
is_ca = true
120-
max_issuer_path_length = 10
120+
# Force the sub CA to only issue leaf certs
121+
max_issuer_path_length = 0
121122
}
122123
key_usage {
123124
base_key_usage {

0 commit comments

Comments
 (0)