Skip to content
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

Jump to bottom

fix: 2107: Add missing schema fields and tests for ext_key_usage_oids #2108

Merged
merged 4 commits into from
Dec 11, 2023
Merged

fix: 2107: Add missing schema fields and tests for ext_key_usage_oids #2108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15d6eb3
fix: 2107: Add missing schema fields and tests for ext_key_usage_oids
austin-laney Dec 11, 2023
a57695b
doc: 2104: add missing changelog entry
austin-laney Dec 11, 2023
50f8cb4
fix: 2107: Apply format fixes & CHANGELOG
austin-laney Dec 11, 2023
d5de130
Update CHANGELOG.md
fairclothjm Dec 11, 2023
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## Unreleased

FEATURES:
* Add support for `ext_key_usage_oids` in `vault_pki_secret_backend_role` ([#2108](https://github.com/hashicorp/terraform-provider-vault/pull/2108))

BUGS:
* fix `vault_kv_secret_v2` drift when "data" is in secret name/path ([#2104](https://github.com/hashicorp/terraform-provider-vault/pull/2104))

Expand Down
1 change: 1 addition & 0 deletions internal/consts/consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ const (
FieldEmailProtectionFlag = "email_protection_flag"
FieldKeyUsage = "key_usage"
FieldExtKeyUsage = "ext_key_usage"
FieldExtKeyUsageOIDs = "ext_key_usage_oids"
FieldUseCSRCommonName = "use_csr_common_name"
FieldUseCSRSans = "use_csr_sans"
FieldOU = "ou"
Expand Down
10 changes: 10 additions & 0 deletions vault/resource_pki_secret_backend_role.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ var pkiSecretListFields = []string{
consts.FieldAllowedDomains,
consts.FieldAllowedSerialNumbers,
consts.FieldExtKeyUsage,
consts.FieldExtKeyUsageOIDs,
}

var pkiSecretBooleanFields = []string{
Expand Down Expand Up @@ -271,6 +272,15 @@ func pkiSecretBackendRoleResource() *schema.Resource {
Type: schema.TypeString,
},
},
consts.FieldExtKeyUsageOIDs: {
Type: schema.TypeList,
Required: false,
Optional: true,
Description: "A list of extended key usage OIDs.",
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
consts.FieldUseCSRCommonName: {
Type: schema.TypeBool,
Required: false,
Expand Down
8 changes: 8 additions & 0 deletions vault/resource_pki_secret_backend_role_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ func TestPkiSecretBackendRole_policy_identifier(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "key_usage.1", "KeyAgreement"),
resource.TestCheckResourceAttr(resourceName, "key_usage.2", "KeyEncipherment"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage.#", "0"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.#", "1"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.0", "1.3.6.1.4.1.311.4"),
resource.TestCheckResourceAttr(resourceName, "use_csr_common_name", "true"),
resource.TestCheckResourceAttr(resourceName, "use_csr_sans", "true"),
resource.TestCheckResourceAttr(resourceName, "ou.0", "test"),
Expand Down Expand Up @@ -160,6 +162,8 @@ func TestPkiSecretBackendRole_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "key_usage.1", "KeyAgreement"),
resource.TestCheckResourceAttr(resourceName, "key_usage.2", "KeyEncipherment"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage.#", "0"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.#", "1"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.0", "1.3.6.1.4.1.311.4"),
resource.TestCheckResourceAttr(resourceName, "use_csr_common_name", "true"),
resource.TestCheckResourceAttr(resourceName, "use_csr_sans", "true"),
resource.TestCheckResourceAttr(resourceName, "ou.0", "test"),
Expand Down Expand Up @@ -298,6 +302,8 @@ func TestPkiSecretBackendRole_basic(t *testing.T) {
resource.TestCheckResourceAttr(resourceName, "key_usage.#", "1"),
resource.TestCheckResourceAttr(resourceName, "key_usage.0", "DigitalSignature"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage.#", "0"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.#", "1"),
resource.TestCheckResourceAttr(resourceName, "ext_key_usage_oids.0", "1.3.6.1.4.1.311.4"),
resource.TestCheckResourceAttr(resourceName, "use_csr_common_name", "true"),
resource.TestCheckResourceAttr(resourceName, "use_csr_sans", "true"),
resource.TestCheckResourceAttr(resourceName, "ou.0", "test"),
Expand Down Expand Up @@ -368,6 +374,7 @@ resource "vault_pki_secret_backend_role" "test" {
key_type = "rsa"
key_bits = 2048
ext_key_usage = []
ext_key_usage_oids = ["1.3.6.1.4.1.311.4"]
use_csr_common_name = true
use_csr_sans = true
ou = ["test"]
Expand Down Expand Up @@ -422,6 +429,7 @@ resource "vault_pki_secret_backend_role" "test" {
key_bits = 2048
key_usage = ["DigitalSignature"]
ext_key_usage = []
ext_key_usage_oids = ["1.3.6.1.4.1.311.4"]
use_csr_common_name = true
use_csr_sans = true
ou = ["test"]
Expand Down
2 changes: 2 additions & 0 deletions website/docs/r/pki_secret_backend_role.html.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ The following arguments are supported:

* `ext_key_usage` - (Optional) Specify the allowed extended key usage constraint on issued certificates

* `ext_key_usage_oids` - (Optional) Specify the allowed extended key usage OIDs constraint on issued certificates

* `use_csr_common_name` - (Optional) Flag to use the CN in the CSR

* `use_csr_sans` - (Optional) Flag to use the SANs in the CSR
Expand Down