Skip to content

Commit

Permalink
Additional changes like those in #1305/#1479 (#1583)
Browse files Browse the repository at this point in the history
  • Loading branch information
bwagner3slb authored Aug 19, 2022
1 parent 5d632d0 commit 4846a3a
Showing 1 changed file with 16 additions and 7 deletions.
23 changes: 16 additions & 7 deletions vault/resource_azure_auth_backend_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,10 @@ func azureAuthBackendConfigResource() *schema.Resource {
}

func azureAuthBackendWrite(d *schema.ResourceData, meta interface{}) error {
config := meta.(*provider.ProviderMeta).GetClient()
config, e := provider.GetClient(d, meta)
if e != nil {
return e
}

// if backend comes from the config, it won't have the StateFunc
// applied yet, so we need to apply it again.
Expand Down Expand Up @@ -100,8 +103,10 @@ func azureAuthBackendWrite(d *schema.ResourceData, meta interface{}) error {
}

func azureAuthBackendRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*provider.ProviderMeta).GetClient()

config, e := provider.GetClient(d, meta)
if e != nil {
return e
}
log.Printf("[DEBUG] Reading Azure auth backend config")
secret, err := config.Logical().Read(d.Id())
if err != nil {
Expand Down Expand Up @@ -130,8 +135,10 @@ func azureAuthBackendRead(d *schema.ResourceData, meta interface{}) error {
}

func azureAuthBackendDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*provider.ProviderMeta).GetClient()

config, e := provider.GetClient(d, meta)
if e != nil {
return e
}
log.Printf("[DEBUG] Deleting Azure auth backend config from %q", d.Id())
_, err := config.Logical().Delete(d.Id())
if err != nil {
Expand All @@ -143,8 +150,10 @@ func azureAuthBackendDelete(d *schema.ResourceData, meta interface{}) error {
}

func azureAuthBackendExists(d *schema.ResourceData, meta interface{}) (bool, error) {
config := meta.(*provider.ProviderMeta).GetClient()

config, e := provider.GetClient(d, meta)
if e != nil {
return false, e
}
log.Printf("[DEBUG] Checking if Azure auth backend is configured at %q", d.Id())
secret, err := config.Logical().Read(d.Id())
if err != nil {
Expand Down

0 comments on commit 4846a3a

Please sign in to comment.