Skip to content

Commit 99126f7

Browse files
arybolovlevarybolovlev
authored
Update [default] service account resource versioning (#2223)
1 parent f584b17 commit 99126f7

8 files changed

+123
-123
lines changed

‎kubernetes/data_source_kubernetes_service_account_v1.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func dataSourceKubernetesServiceAccountV1Read(ctx context.Context, d *schema.Res
7171
return diag.Errorf("Unable to fetch service account from Kubernetes: %s", err)
7272
}
7373

74-
defaultSecret, diagMsg := findDefaultServiceAccount(ctx, sa, conn)
74+
defaultSecret, diagMsg := findDefaultServiceAccountV1(ctx, sa, conn)
7575

7676
err = d.Set("default_secret_name", defaultSecret)
7777
if err != nil {
@@ -80,7 +80,7 @@ func dataSourceKubernetesServiceAccountV1Read(ctx context.Context, d *schema.Res
8080

8181
d.SetId(buildId(sa.ObjectMeta))
8282

83-
diagMsg = append(diagMsg, resourceKubernetesServiceAccountRead(ctx, d, meta)...)
83+
diagMsg = append(diagMsg, resourceKubernetesServiceAccountV1Read(ctx, d, meta)...)
8484

8585
return diagMsg
8686
}

‎kubernetes/provider.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -252,10 +252,10 @@ func Provider() *schema.Provider {
252252
"kubernetes_namespace_v1": resourceKubernetesNamespaceV1(),
253253
"kubernetes_service": resourceKubernetesService(),
254254
"kubernetes_service_v1": resourceKubernetesService(),
255-
"kubernetes_service_account": resourceKubernetesServiceAccount(),
256-
"kubernetes_service_account_v1": resourceKubernetesServiceAccount(),
257-
"kubernetes_default_service_account": resourceKubernetesDefaultServiceAccount(),
258-
"kubernetes_default_service_account_v1": resourceKubernetesDefaultServiceAccount(),
255+
"kubernetes_service_account": resourceKubernetesServiceAccountV1(),
256+
"kubernetes_service_account_v1": resourceKubernetesServiceAccountV1(),
257+
"kubernetes_default_service_account": resourceKubernetesDefaultServiceAccountV1(),
258+
"kubernetes_default_service_account_v1": resourceKubernetesDefaultServiceAccountV1(),
259259
"kubernetes_config_map": resourceKubernetesConfigMap(),
260260
"kubernetes_config_map_v1": resourceKubernetesConfigMap(),
261261
"kubernetes_config_map_v1_data": resourceKubernetesConfigMapV1Data(),

‎kubernetes/resource_kubernetes_default_service_account.go‎ renamed to ‎kubernetes/resource_kubernetes_default_service_account_v1.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import (
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1313
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
14-
api "k8s.io/api/core/v1"
14+
corev1 "k8s.io/api/core/v1"
1515
"k8s.io/apimachinery/pkg/api/errors"
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717
pkgApi "k8s.io/apimachinery/pkg/types"
1818
)
1919

20-
func resourceKubernetesDefaultServiceAccount() *schema.Resource {
21-
serviceAccountResource := resourceKubernetesServiceAccount()
20+
func resourceKubernetesDefaultServiceAccountV1() *schema.Resource {
21+
serviceAccountResource := resourceKubernetesServiceAccountV1()
2222

2323
metaSchema := namespacedMetadataSchema("service account", false)
2424

@@ -29,19 +29,19 @@ func resourceKubernetesDefaultServiceAccount() *schema.Resource {
2929

3030
serviceAccountResource.Schema["metadata"] = metaSchema
3131

32-
serviceAccountResource.CreateContext = resourceKubernetesDefaultServiceAccountCreate
32+
serviceAccountResource.CreateContext = resourceKubernetesDefaultServiceAccountV1Create
3333

3434
return serviceAccountResource
3535
}
3636

37-
func resourceKubernetesDefaultServiceAccountCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
37+
func resourceKubernetesDefaultServiceAccountV1Create(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
3838
conn, err := meta.(KubeClientsets).MainClientset()
3939
if err != nil {
4040
return diag.FromErr(err)
4141
}
4242

4343
metadata := expandMetadata(d.Get("metadata").([]interface{}))
44-
svcAcc := api.ServiceAccount{ObjectMeta: metadata}
44+
svcAcc := corev1.ServiceAccount{ObjectMeta: metadata}
4545

4646
log.Printf("[INFO] Checking for default service account existence: %s", metadata.Namespace)
4747
err = resource.RetryContext(ctx, d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
@@ -62,7 +62,7 @@ func resourceKubernetesDefaultServiceAccountCreate(ctx context.Context, d *schem
6262
return diag.FromErr(err)
6363
}
6464

65-
secret, err := getServiceAccountDefaultSecret(ctx, "default", svcAcc, d.Timeout(schema.TimeoutCreate), conn)
65+
secret, err := getServiceAccountDefaultSecretV1(ctx, "default", svcAcc, d.Timeout(schema.TimeoutCreate), conn)
6666
if err != nil {
6767
return diag.FromErr(err)
6868
}
@@ -103,5 +103,5 @@ func resourceKubernetesDefaultServiceAccountCreate(ctx context.Context, d *schem
103103

104104
d.SetId(buildId(metadata))
105105

106-
return resourceKubernetesServiceAccountRead(ctx, d, meta)
106+
return resourceKubernetesServiceAccountV1Read(ctx, d, meta)
107107
}

‎kubernetes/resource_kubernetes_default_service_account_test.go‎ renamed to ‎kubernetes/resource_kubernetes_default_service_account_v1_test.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ import (
1010

1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1212
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
13-
api "k8s.io/api/core/v1"
13+
corev1 "k8s.io/api/core/v1"
1414
)
1515

16-
func TestAccKubernetesDefaultServiceAccount_basic(t *testing.T) {
17-
var conf api.ServiceAccount
16+
func TestAccKubernetesDefaultServiceAccountV1_basic(t *testing.T) {
17+
var conf corev1.ServiceAccount
1818
namespace := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
1919
resourceName := "kubernetes_default_service_account_v1.test"
2020

@@ -23,12 +23,12 @@ func TestAccKubernetesDefaultServiceAccount_basic(t *testing.T) {
2323
IDRefreshName: resourceName,
2424
IDRefreshIgnore: []string{"metadata.0.resource_version"},
2525
ProviderFactories: testAccProviderFactories,
26-
CheckDestroy: testAccCheckKubernetesServiceAccountDestroy,
26+
CheckDestroy: testAccCheckKubernetesServiceAccountV1Destroy,
2727
Steps: []resource.TestStep{
2828
{
29-
Config: testAccKubernetesDefaultServiceAccountConfig_basic(namespace),
29+
Config: testAccKubernetesDefaultServiceAccountV1Config_basic(namespace),
3030
Check: resource.ComposeAggregateTestCheckFunc(
31-
testAccCheckKubernetesServiceAccountExists(resourceName, &conf),
31+
testAccCheckKubernetesServiceAccountV1Exists(resourceName, &conf),
3232
resource.TestCheckResourceAttr(resourceName, "metadata.0.annotations.%", "2"),
3333
resource.TestCheckResourceAttr(resourceName, "metadata.0.annotations.TestAnnotationOne", "one"),
3434
resource.TestCheckResourceAttr(resourceName, "metadata.0.annotations.TestAnnotationTwo", "two"),
@@ -54,33 +54,33 @@ func TestAccKubernetesDefaultServiceAccount_basic(t *testing.T) {
5454
})
5555
}
5656

57-
func TestAccKubernetesDefaultServiceAccount_secrets(t *testing.T) {
58-
var conf api.ServiceAccount
57+
func TestAccKubernetesDefaultServiceAccountV1_secrets(t *testing.T) {
58+
var conf corev1.ServiceAccount
5959
name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
6060
namespace := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
6161
resourceName := "kubernetes_default_service_account_v1.test"
6262

6363
resource.ParallelTest(t, resource.TestCase{
6464
PreCheck: func() { testAccPreCheck(t) },
65-
IDRefreshName: "kubernetes_default_service_account.test",
65+
IDRefreshName: resourceName,
6666
IDRefreshIgnore: []string{"metadata.0.resource_version"},
6767
ProviderFactories: testAccProviderFactories,
68-
CheckDestroy: testAccCheckKubernetesServiceAccountDestroy,
68+
CheckDestroy: testAccCheckKubernetesServiceAccountV1Destroy,
6969
Steps: []resource.TestStep{
7070
{
71-
Config: testAccKubernetesDefaultServiceAccountConfig_secrets(namespace, name),
71+
Config: testAccKubernetesDefaultServiceAccountV1Config_secrets(namespace, name),
7272
Check: resource.ComposeAggregateTestCheckFunc(
73-
testAccCheckKubernetesServiceAccountExists(resourceName, &conf),
73+
testAccCheckKubernetesServiceAccountV1Exists(resourceName, &conf),
7474
resource.TestCheckResourceAttr(resourceName, "metadata.0.name", "default"),
7575
resource.TestCheckResourceAttrSet(resourceName, "metadata.0.generation"),
7676
resource.TestCheckResourceAttrSet(resourceName, "metadata.0.resource_version"),
7777
resource.TestCheckResourceAttrSet(resourceName, "metadata.0.uid"),
7878
resource.TestCheckResourceAttr(resourceName, "secret.#", "1"),
7979
resource.TestCheckResourceAttr(resourceName, "image_pull_secret.#", "1"),
80-
testAccCheckServiceAccountImagePullSecrets(&conf, []*regexp.Regexp{
80+
testAccCheckServiceAccountV1ImagePullSecrets(&conf, []*regexp.Regexp{
8181
regexp.MustCompile("^" + name + "-two$"),
8282
}),
83-
testAccCheckServiceAccountSecrets(&conf, []*regexp.Regexp{
83+
testAccCheckServiceAccountV1Secrets(&conf, []*regexp.Regexp{
8484
regexp.MustCompile("^" + name + "one$"),
8585
regexp.MustCompile("^default-token-[a-z0-9]+$"),
8686
}),
@@ -90,8 +90,8 @@ func TestAccKubernetesDefaultServiceAccount_secrets(t *testing.T) {
9090
})
9191
}
9292

93-
func TestAccKubernetesDefaultServiceAccount_automountServiceAccountToken(t *testing.T) {
94-
var conf api.ServiceAccount
93+
func TestAccKubernetesDefaultServiceAccountV1_automountServiceAccountToken(t *testing.T) {
94+
var conf corev1.ServiceAccount
9595
namespace := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
9696
resourceName := "kubernetes_default_service_account_v1.test"
9797

@@ -100,12 +100,12 @@ func TestAccKubernetesDefaultServiceAccount_automountServiceAccountToken(t *test
100100
IDRefreshName: resourceName,
101101
IDRefreshIgnore: []string{"metadata.0.resource_version"},
102102
ProviderFactories: testAccProviderFactories,
103-
CheckDestroy: testAccCheckKubernetesServiceAccountDestroy,
103+
CheckDestroy: testAccCheckKubernetesServiceAccountV1Destroy,
104104
Steps: []resource.TestStep{
105105
{
106-
Config: testAccKubernetesDefaultServiceAccountConfig_automountServiceAccountToken(namespace),
106+
Config: testAccKubernetesDefaultServiceAccountV1Config_automountServiceAccountToken(namespace),
107107
Check: resource.ComposeAggregateTestCheckFunc(
108-
testAccCheckKubernetesServiceAccountExists(resourceName, &conf),
108+
testAccCheckKubernetesServiceAccountV1Exists(resourceName, &conf),
109109
resource.TestCheckResourceAttr(resourceName, "metadata.0.name", "default"),
110110
resource.TestCheckResourceAttrSet(resourceName, "metadata.0.generation"),
111111
resource.TestCheckResourceAttrSet(resourceName, "metadata.0.resource_version"),
@@ -123,7 +123,7 @@ func TestAccKubernetesDefaultServiceAccount_automountServiceAccountToken(t *test
123123
})
124124
}
125125

126-
func testAccKubernetesDefaultServiceAccountConfig_basic(namespace string) string {
126+
func testAccKubernetesDefaultServiceAccountV1Config_basic(namespace string) string {
127127
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
128128
metadata {
129129
name = "%s"
@@ -149,7 +149,7 @@ resource "kubernetes_default_service_account_v1" "test" {
149149
`, namespace)
150150
}
151151

152-
func testAccKubernetesDefaultServiceAccountConfig_secrets(namespace string, name string) string {
152+
func testAccKubernetesDefaultServiceAccountV1Config_secrets(namespace string, name string) string {
153153
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
154154
metadata {
155155
name = "%s"
@@ -186,7 +186,7 @@ resource "kubernetes_secret_v1" "two" {
186186
`, namespace, name, name)
187187
}
188188

189-
func testAccKubernetesDefaultServiceAccountConfig_automountServiceAccountToken(namespace string) string {
189+
func testAccKubernetesDefaultServiceAccountV1Config_automountServiceAccountToken(namespace string) string {
190190
return fmt.Sprintf(`resource "kubernetes_namespace_v1" "test" {
191191
metadata {
192192
name = "%s"

‎kubernetes/resource_kubernetes_pod_v1_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ func TestAccKubernetesPodV1_config_with_automount_service_account_token(t *testi
10981098
{
10991099
Config: testAccKubernetesPodV1ConfigWithAutomountServiceAccountToken(saName, podName, imageName),
11001100
Check: resource.ComposeAggregateTestCheckFunc(
1101-
testAccCheckKubernetesServiceAccountExists("kubernetes_service_account.test", &confSA),
1101+
testAccCheckKubernetesServiceAccountV1Exists("kubernetes_service_account.test", &confSA),
11021102
testAccCheckKubernetesPodV1Exists(resourceName, &confPod),
11031103
resource.TestCheckResourceAttr(resourceName, "spec.0.automount_service_account_token", "true"),
11041104
),

0 commit comments

Comments
 (0)