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

Fix cross sub creation failure on keyvault embedded resources #14047

Closed
wants to merge 1 commit into from
Closed

Fix cross sub creation failure on keyvault embedded resources #14047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions internal/services/keyvault/key_vault_certificate_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,7 @@ func keyVaultCertificateCreationRefreshFunc(ctx context.Context, client *keyvaul
}

func resourceKeyVaultCertificateRead(d *pluginsdk.ResourceData, meta interface{}) error {
keyVaultsClient := meta.(*clients.Client).KeyVault
client := meta.(*clients.Client).KeyVault.ManagementClient
resourcesClient := meta.(*clients.Client).Resource
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand All @@ -537,31 +535,6 @@ func resourceKeyVaultCertificateRead(d *pluginsdk.ResourceData, meta interface{}
return err
}

keyVaultIdRaw, err := keyVaultsClient.KeyVaultIDFromBaseUrl(ctx, resourcesClient, id.KeyVaultBaseUrl)
if err != nil {
return fmt.Errorf("retrieving the Resource ID the Key Vault at URL %q: %s", id.KeyVaultBaseUrl, err)
}
if keyVaultIdRaw == nil {
log.Printf("[DEBUG] Unable to determine the Resource ID for the Key Vault at URL %q - removing from state!", id.KeyVaultBaseUrl)
d.SetId("")
return nil
}

keyVaultId, err := parse.VaultID(*keyVaultIdRaw)
if err != nil {
return err
}

ok, err := keyVaultsClient.Exists(ctx, *keyVaultId)
if err != nil {
return fmt.Errorf("checking if %s for Certificate %q exists: %v", *keyVaultId, id.Name, err)
}
if !ok {
log.Printf("[DEBUG] Certificate %q was not found in %s - removing from state", id.Name, *keyVaultId)
d.SetId("")
return nil
}

cert, err := client.GetCertificate(ctx, id.KeyVaultBaseUrl, id.Name, "")
if err != nil {
if utils.ResponseWasNotFound(cert.Response) {
Expand Down
26 changes: 0 additions & 26 deletions internal/services/keyvault/key_vault_key_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,9 +336,7 @@ func resourceKeyVaultKeyUpdate(d *pluginsdk.ResourceData, meta interface{}) erro
}

func resourceKeyVaultKeyRead(d *pluginsdk.ResourceData, meta interface{}) error {
keyVaultsClient := meta.(*clients.Client).KeyVault
client := meta.(*clients.Client).KeyVault.ManagementClient
resourcesClient := meta.(*clients.Client).Resource
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand All @@ -347,30 +345,6 @@ func resourceKeyVaultKeyRead(d *pluginsdk.ResourceData, meta interface{}) error
return err
}

keyVaultIdRaw, err := keyVaultsClient.KeyVaultIDFromBaseUrl(ctx, resourcesClient, id.KeyVaultBaseUrl)
if err != nil {
return fmt.Errorf("retrieving the Resource ID the Key Vault at URL %q: %s", id.KeyVaultBaseUrl, err)
}
if keyVaultIdRaw == nil {
log.Printf("[DEBUG] Unable to determine the Resource ID for the Key Vault at URL %q - removing from state!", id.KeyVaultBaseUrl)
d.SetId("")
return nil
}
keyVaultId, err := parse.VaultID(*keyVaultIdRaw)
if err != nil {
return err
}

ok, err := keyVaultsClient.Exists(ctx, *keyVaultId)
if err != nil {
return fmt.Errorf("checking if key vault %q for Key %q in Vault at url %q exists: %v", *keyVaultId, id.Name, id.KeyVaultBaseUrl, err)
}
if !ok {
log.Printf("[DEBUG] Key %q Key Vault %q was not found in Key Vault at URI %q - removing from state", id.Name, *keyVaultId, id.KeyVaultBaseUrl)
d.SetId("")
return nil
}

resp, err := client.GetKey(ctx, id.KeyVaultBaseUrl, id.Name, "")
if err != nil {
if utils.ResponseWasNotFound(resp.Response) {
Expand Down
26 changes: 0 additions & 26 deletions internal/services/keyvault/key_vault_secret_resource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,9 +290,7 @@ func resourceKeyVaultSecretUpdate(d *pluginsdk.ResourceData, meta interface{}) e
}

func resourceKeyVaultSecretRead(d *pluginsdk.ResourceData, meta interface{}) error {
keyVaultsClient := meta.(*clients.Client).KeyVault
client := meta.(*clients.Client).KeyVault.ManagementClient
resourcesClient := meta.(*clients.Client).Resource
ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d)
defer cancel()

Expand All @@ -301,30 +299,6 @@ func resourceKeyVaultSecretRead(d *pluginsdk.ResourceData, meta interface{}) err
return err
}

keyVaultIdRaw, err := keyVaultsClient.KeyVaultIDFromBaseUrl(ctx, resourcesClient, id.KeyVaultBaseUrl)
if err != nil {
return fmt.Errorf("retrieving the Resource ID the Key Vault at URL %q: %s", id.KeyVaultBaseUrl, err)
}
if keyVaultIdRaw == nil {
log.Printf("[DEBUG] Unable to determine the Resource ID for the Key Vault at URL %q - removing from state!", id.KeyVaultBaseUrl)
d.SetId("")
return nil
}
keyVaultId, err := parse.VaultID(*keyVaultIdRaw)
if err != nil {
return err
}

ok, err := keyVaultsClient.Exists(ctx, *keyVaultId)
if err != nil {
return fmt.Errorf("checking if key vault %q for Secret %q in Vault at url %q exists: %v", *keyVaultId, id.Name, id.KeyVaultBaseUrl, err)
}
if !ok {
log.Printf("[DEBUG] Secret %q Key Vault %q was not found in Key Vault at URI %q - removing from state", id.Name, *keyVaultId, id.KeyVaultBaseUrl)
d.SetId("")
return nil
}

// we always want to get the latest version
resp, err := client.GetSecret(ctx, id.KeyVaultBaseUrl, id.Name, "")
if err != nil {
Expand Down