Skip to content

Commit ec0fe79

Browse files
author
David Montoya
committed
kubernetes auth role: allow unset audience
1 parent 93cac34 commit ec0fe79

2 files changed

Lines changed: 42 additions & 2 deletions

File tree

vault/resource_kubernetes_auth_backend_role.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,14 @@ func kubernetesAuthBackendRoleUpdateFields(d *schema.ResourceData, data map[stri
159159
data["period"] = v.(int)
160160
}
161161

162-
if v, ok := d.GetOk("audience"); ok {
163-
data["audience"] = v.(string)
162+
if create {
163+
if v, ok := d.GetOk("audience"); ok {
164+
data["audience"] = v.(string)
165+
}
166+
} else {
167+
if d.HasChange("audience") {
168+
data["audience"] = d.Get("audience").(string)
169+
}
164170
}
165171
}
166172

vault/resource_kubernetes_auth_backend_role_test.go

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,40 @@ func TestAccKubernetesAuthBackendRole_fullUpdate(t *testing.T) {
373373
"audience", newAudience),
374374
),
375375
},
376+
// Unset `audience`
377+
{
378+
Config: testAccKubernetesAuthBackendRoleConfig_basicWithAudience(backend, role, newTTL, ""),
379+
Check: resource.ComposeTestCheckFunc(
380+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
381+
"backend", backend),
382+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
383+
"role_name", role),
384+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
385+
"bound_service_account_names.64447719", "example"),
386+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
387+
"bound_service_account_names.#", "1"),
388+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
389+
"bound_service_account_namespaces.64447719", "example"),
390+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
391+
"bound_service_account_namespaces.#", "1"),
392+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
393+
"token_policies.1971754988", "default"),
394+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
395+
"token_policies.326271447", "dev"),
396+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
397+
"token_policies.232240223", "prod"),
398+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
399+
"token_policies.#", "3"),
400+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
401+
"token_ttl", strconv.Itoa(newTTL)),
402+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
403+
"token_max_ttl", "0"),
404+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
405+
"token_period", "0"),
406+
resource.TestCheckResourceAttr("vault_kubernetes_auth_backend_role.role",
407+
"audience", ""),
408+
),
409+
},
376410
},
377411
})
378412
}

0 commit comments

Comments
 (0)