azurerm_key_vault_certificate_issuer - org_id is now optional #8687

hashicorp · Oct 1, 2020 · 08c665d · 08c665d
1 parent 54e1e41
commit 08c665d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 21 deletions.
diff --git a/azurerm/internal/services/keyvault/key_vault_certificate_issuer_resource.go b/azurerm/internal/services/keyvault/key_vault_certificate_issuer_resource.go
@@ -49,21 +49,24 @@ func resourceArmKeyVaultCertificateIssuer() *schema.Resource {
 				ValidateFunc: validate.KeyVaultCertificateIssuerName,
 			},
 
-			"org_id": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ValidateFunc: validation.StringIsNotEmpty,
-			},
-
 			"provider_name": {
 				Type:     schema.TypeString,
 				Required: true,
 				ValidateFunc: validation.StringInSlice([]string{
 					"DigiCert",
 					"GlobalSign",
+					"OneCertV2-PrivateCA",
+					"OneCertV2-PublicCA",
+					"SslAdminV2",
 				}, false),
 			},
 
+			"org_id": {
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringIsNotEmpty,
+			},
+
 			"account_id": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -131,19 +134,18 @@ func resourceArmKeyVaultCertificateIssuerCreateOrUpdate(d *schema.ResourceData,
 	}
 
 	parameter := keyvault.CertificateIssuerSetParameters{
-		Provider: utils.String(d.Get("provider_name").(string)),
+		Provider:            utils.String(d.Get("provider_name").(string)),
+		OrganizationDetails: &keyvault.OrganizationDetails{},
 	}
 
-	orgDetails := &keyvault.OrganizationDetails{
-		ID: utils.String(d.Get("org_id").(string)),
+	if orgIdRaw, ok := d.GetOk("org_id"); ok {
+		parameter.OrganizationDetails.ID = utils.String(orgIdRaw.(string))
 	}
 
 	if adminsRaw, ok := d.GetOk("admin"); ok {
-		orgDetails.AdminDetails = expandKeyVaultCertificateIssuerOrganizationDetailsAdminDetails(adminsRaw.([]interface{}))
+		parameter.OrganizationDetails.AdminDetails = expandKeyVaultCertificateIssuerOrganizationDetailsAdminDetails(adminsRaw.([]interface{}))
 	}
 
-	parameter.OrganizationDetails = orgDetails
-
 	accountId, gotAccountId := d.GetOk("account_id")
 	password, gotPassword := d.GetOk("password")
 

diff --git a/azurerm/internal/services/keyvault/tests/key_vault_certificate_issuer_resource_test.go b/azurerm/internal/services/keyvault/tests/key_vault_certificate_issuer_resource_test.go
@@ -307,10 +307,7 @@ resource "azurerm_key_vault" "test" {
 resource "azurerm_key_vault_certificate_issuer" "test" {
   name          = "acctestKVCI-%d"
   key_vault_id  = azurerm_key_vault.test.id
-  org_id        = "accTestOrg"
-  account_id    = "test-account"
-  password      = "test"
-  provider_name = "DigiCert"
+  provider_name = "OneCertV2-PrivateCA"
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger)
 }

diff --git a/website/docs/r/key_vault_certificate_issuer.html.markdown b/website/docs/r/key_vault_certificate_issuer.html.markdown
@@ -46,14 +46,14 @@ The following arguments are supported:
 
 * `name` - (Required) The name which should be used for this Key Vault Certificate Issuer. Changing this forces a new Key Vault Certificate Issuer to be created.
 
-* `org_id` - (Required) The ID of the organization as provided to the issuer. 
+* `provider_name` - (Required) The name of the third-party Certificate Issuer. Possible values are: `DigiCert`, `GlobalSign`, `OneCertV2-PrivateCA`, `OneCertV2-PublicCA` and `SslAdminV2`.
+
+* `org_id` - (Optional) The ID of the organization as provided to the issuer. 
 
 * `account_id` - (Optional) The account number with the third-party Certificate Issuer.
 
 * `admin` - (Optional) One or more `admin` blocks as defined below.
 
-* `provider_name` - (Required) The name of the third-party Certificate Issuer. Possible values are: `DigiCert`, `GlobalSign`.
-
 * `password` - (Optional) The password associated with the account and organization ID at the third-party Certificate Issuer. If not specified, will not overwrite any previous value.
 
 ---
@@ -74,8 +74,6 @@ In addition to the Arguments listed above - the following Attributes are exporte
 
 * `id` - The ID of the Key Vault Certificate Issuer.
 
-
-
 ## Import
 
 Key Vault Certificate Issuers can be imported using the `resource id`, e.g.