Skip to content

Update test to key_usage that is supported on a CA certificate. #2446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: victorr/vault-33847-key-usage-pki-secret-backend-root-sign-intermediate-update
Choose a base branch
from
Open

Update test to key_usage that is supported on a CA certificate. #2446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1434a
Add key_usage support to vault_pki_secret_backend_root_sign_intermedi…
victorr Mar 4, 2025
11710aa
Update test to key_usage that is supported on a CA certificate.
kitography Apr 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions vault/resource_pki_secret_backend_root_sign_intermediate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,15 @@ func pkiSecretBackendRootSignIntermediateResource() *schema.Resource {
ForceNew: true,
Default: -1,
},
consts.FieldKeyUsage: {
Type: schema.TypeList,
Optional: true,
Description: "Specify the key usages to be added to the existing set of key usages, CRL,CertSign, on the generated certificate.",
ForceNew: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
consts.FieldExcludeCNFromSans: {
Type: schema.TypeBool,
Optional: true,
Expand Down Expand Up @@ -361,6 +370,7 @@ func pkiSecretBackendRootSignIntermediateCreate(ctx context.Context, d *schema.R
consts.FieldURISans,
consts.FieldOtherSans,
consts.FieldPermittedDNSDomains,
consts.FieldKeyUsage,
}

// Whether name constraints fields (other than permitted_dns_domains), are supproted,
Expand Down
19 changes: 19 additions & 0 deletions vault/resource_pki_secret_backend_root_sign_intermediate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,25 @@ func TestPkiSecretBackendRootSignIntermediate_basic_default(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, consts.FieldUsePSS, "true"),
),
},
{
SkipFunc: skip(provider.VaultVersion118),
Config: testPkiSecretBackendRootSignIntermediateConfig_basic(rootPath, intermediatePath, false,
`key_usage = ["DigitalSignature", "CertSign"]`),
Check: resource.ComposeTestCheckFunc(
checks,
resource.TestCheckResourceAttr(resourceName, consts.FieldKeyUsage+".#", "2"),
resource.TestCheckResourceAttr(resourceName, consts.FieldKeyUsage+".0", "DigitialSignature"),
resource.TestCheckResourceAttr(resourceName, consts.FieldKeyUsage+".1", "CertSign"),
testPKICert(resourceName, func(cert *x509.Certificate) error {
if 0 == cert.KeyUsage&x509.KeyUsageKeyAgreement || 0 == cert.KeyUsage&x509.KeyUsageCertSign {
return fmt.Errorf("KeyUsage expected %b, got %b",
x509.KeyUsageDigitalSignature|x509.KeyUsageCertSign|x509.KeyUsageCRLSign,
cert.KeyUsage)
}
return nil
}),
),
},
},
})
}
Expand Down
Loading