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.

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

Create azure secrets backend Update Functionality #1009

Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 57 additions & 1 deletion vault/resource_azure_secret_backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ func azureSecretBackendResource() *schema.Resource {
return &schema.Resource{
Create: azureSecretBackendCreate,
Read: azureSecretBackendRead,
Update: azureSecretBackendCreate,
Update: azureSecretBackendUpdate,
Delete: azureSecretBackendDelete,
Exists: azureSecretBackendExists,
Importer: &schema.ResourceImporter{
Expand Down Expand Up @@ -145,12 +145,68 @@ func azureSecretBackendRead(d *schema.ResourceData, meta interface{}) error {
return nil
}

log.Printf("[DEBUG] Read Azure secret Backend config %s", path)
resp, err := client.Logical().Read(path + "/config")
tvoran marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
tvoran marked this conversation as resolved.
Show resolved Hide resolved
if v, ok := resp.Data["client_id"].(string); ok {
d.Set("client_id", v)
}
if v, ok := resp.Data["subscription_id"].(string); ok {
d.Set("subscription_id", v)
}
if v, ok := resp.Data["tenant_id"].(string); ok {
d.Set("tenant_id", v)
}
if v, ok := resp.Data["environment"].(string); ok && v != "" {
d.Set("environment", v)
} else {
d.Set("environment", "AzurePublicCloud")
}
}

d.Set("path", path)
d.Set("description", mount.Description)

return nil
}

func azureSecretBackendUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*api.Client)

path := d.Id()
d.Partial(true)
tvoran marked this conversation as resolved.
Show resolved Hide resolved
if d.HasChange("client_id") || d.HasChange("environment") || d.HasChange("tenant_id") || d.HasChange("client_secret") {
log.Printf("[DEBUG] Updating Azure Backend Config at %q", path+"/config")
data := map[string]interface{}{
"tenant_id": d.Get("tenant_id").(string),
"client_id": d.Get("client_id").(string),
"client_secret": d.Get("client_secret").(string),
"subscription_id": d.Get("subscription_id").(string),
tvoran marked this conversation as resolved.
Show resolved Hide resolved
}

environment := d.Get("environment").(string)
if environment != "" {
data["environment"] = environment
}

_, err := client.Logical().Write(path+"/config", data)
if err != nil {
return fmt.Errorf("error writing config for %q: %s", path, err)
}
log.Printf("[DEBUG] Updated Azure Backend Config at %q", path+"/config")
d.SetPartial("tenant_id")
d.SetPartial("client_id")
d.SetPartial("cleint_secret")
d.SetPartial("subscription_id")
if environment == "" {
d.Set("environment", "AzurePublicCloud")
}
d.SetPartial("environment")
tvoran marked this conversation as resolved.
Show resolved Hide resolved
}
d.Partial(false)
tvoran marked this conversation as resolved.
Show resolved Hide resolved
return azureSecretBackendRead(d, meta)
}

func azureSecretBackendDelete(d *schema.ResourceData, meta interface{}) error {
client := meta.(*api.Client)

Expand Down
23 changes: 23 additions & 0 deletions vault/resource_azure_secret_backend_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ func TestAzureSecretBackend(t *testing.T) {
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "environment", "AzurePublicCloud"),
),
},
{
Config: testAzureSecretBackend_updated(path),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "path", path),
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "subscription_id", "11111111-2222-3333-4444-111111111111"),
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "tenant_id", "22222222-3333-4444-5555-333333333333"),
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "client_id", "22222222-3333-4444-5555-444444444444"),
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "client_secret", "098765432109876543214"),
resource.TestCheckResourceAttr("vault_azure_secret_backend.test", "environment", "AzurePublicCloud"),
),
},
},
})
}
Expand Down Expand Up @@ -67,3 +78,15 @@ resource "vault_azure_secret_backend" "test" {
environment = "AzurePublicCloud"
}`, path)
}

func testAzureSecretBackend_updated(path string) string {
return fmt.Sprintf(`
resource "vault_azure_secret_backend" "test" {
path = "%s"
subscription_id = "11111111-2222-3333-4444-111111111111"
tenant_id = "22222222-3333-4444-5555-333333333333"
client_id = "22222222-3333-4444-5555-444444444444"
client_secret = "098765432109876543214"
environment = "AzurePublicCloud"
tvoran marked this conversation as resolved.
Show resolved Hide resolved
}`, path)
}