Skip to content

Commit ad3161f

Browse files
dak1n1dak1n1
authored
Fix some acceptance test errors (#1194)
* Ensure test for 961 passes with expected error * comment out TestAccKubernetesJob_ttl_seconds_after_finished until feature exists * removed superfluous broken test for Endpoints * Removed check for volumes that no longer exist These were removed in #1096 * fix importStateVerify error * fix import errors
1 parent 8d619ed commit ad3161f

File tree

5 files changed

+40
-145
lines changed

5 files changed

+40
-145
lines changed

‎kubernetes/resource_kubernetes_endpoints_test.go‎

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import (
66
"regexp"
77
"testing"
88

9-
"github.com/google/go-cmp/cmp"
109
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1110
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1211
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
@@ -38,22 +37,6 @@ func TestAccKubernetesEndpoints_basic(t *testing.T) {
3837
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.name", "httptransport"),
3938
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.port", "80"),
4039
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.protocol", "TCP"),
41-
testAccCheckEndpointSubsets(&conf, []api.EndpointSubset{
42-
{
43-
Addresses: []api.EndpointAddress{
44-
{
45-
IP: "10.0.0.4",
46-
},
47-
},
48-
Ports: []api.EndpointPort{
49-
{
50-
Name: "httptransport",
51-
Port: 80,
52-
Protocol: api.ProtocolTCP,
53-
},
54-
},
55-
},
56-
}),
5740
),
5841
},
5942
{
@@ -99,60 +82,6 @@ func TestAccKubernetesEndpoints_basic(t *testing.T) {
9982
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.1.not_ready_address.0.ip", "10.0.0.10"),
10083
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.1.not_ready_address.1.ip", "10.0.0.11"),
10184
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.1.not_ready_address.1.%", "3"),
102-
103-
testAccCheckEndpointSubsets(&conf, []api.EndpointSubset{
104-
{
105-
Addresses: []api.EndpointAddress{
106-
{
107-
IP: "10.0.0.5",
108-
},
109-
},
110-
Ports: []api.EndpointPort{
111-
{
112-
Name: "httptransport",
113-
Port: 82,
114-
Protocol: api.ProtocolTCP,
115-
},
116-
},
117-
},
118-
{
119-
Addresses: []api.EndpointAddress{
120-
{
121-
IP: "10.0.0.6",
122-
Hostname: "test-hostname",
123-
NodeName: ptrToString("test-nodename"),
124-
},
125-
{
126-
IP: "10.0.0.7",
127-
},
128-
},
129-
NotReadyAddresses: []api.EndpointAddress{
130-
{
131-
IP: "10.0.0.10",
132-
},
133-
{
134-
IP: "10.0.0.11",
135-
},
136-
},
137-
Ports: []api.EndpointPort{
138-
{
139-
Name: "httpstransport2",
140-
Port: 444,
141-
Protocol: api.ProtocolTCP,
142-
},
143-
{
144-
Name: "httpstransport",
145-
Port: 443,
146-
Protocol: api.ProtocolTCP,
147-
},
148-
{
149-
Name: "aaaa",
150-
Port: 442,
151-
Protocol: api.ProtocolTCP,
152-
},
153-
},
154-
},
155-
}),
15685
),
15786
},
15887
{
@@ -169,22 +98,6 @@ func TestAccKubernetesEndpoints_basic(t *testing.T) {
16998
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.name", "httptransport"),
17099
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.port", "80"),
171100
resource.TestCheckResourceAttr("kubernetes_endpoints.test", "subset.0.port.0.protocol", "TCP"),
172-
testAccCheckEndpointSubsets(&conf, []api.EndpointSubset{
173-
{
174-
Addresses: []api.EndpointAddress{
175-
{
176-
IP: "10.0.0.4",
177-
},
178-
},
179-
Ports: []api.EndpointPort{
180-
{
181-
Name: "httptransport",
182-
Port: 80,
183-
Protocol: api.ProtocolTCP,
184-
},
185-
},
186-
},
187-
}),
188101
),
189102
},
190103
},
@@ -226,21 +139,6 @@ func TestAccKubernetesEndpoints_generatedName(t *testing.T) {
226139
})
227140
}
228141

229-
func testAccCheckEndpointSubsets(svc *api.Endpoints, expected []api.EndpointSubset) resource.TestCheckFunc {
230-
return func(s *terraform.State) error {
231-
if len(expected) == 0 && len(svc.Subsets) == 0 {
232-
return nil
233-
}
234-
235-
subsets := svc.Subsets
236-
if diff := cmp.Diff(expected, subsets); diff != "" {
237-
return fmt.Errorf("Unexpected output from expander: mismatch (-want +got):\n%s", diff)
238-
}
239-
240-
return nil
241-
}
242-
}
243-
244142
func testAccCheckKubernetesEndpointDestroy(s *terraform.State) error {
245143
conn, err := testAccProvider.Meta().(KubeClientsets).MainClientset()
246144

‎kubernetes/resource_kubernetes_job_test.go‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -189,29 +189,30 @@ func TestAccKubernetesJob_update(t *testing.T) {
189189
})
190190
}
191191

192-
func TestAccKubernetesJob_ttl_seconds_after_finished(t *testing.T) {
193-
var conf api.Job
194-
name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
195-
196-
resource.Test(t, resource.TestCase{
197-
PreCheck: func() { testAccPreCheck(t) },
198-
IDRefreshName: "kubernetes_job.test",
199-
IDRefreshIgnore: []string{
200-
"spec.0.selector.0.match_expressions.#",
201-
},
202-
ProviderFactories: testAccProviderFactories,
203-
CheckDestroy: testAccCheckKubernetesJobDestroy,
204-
Steps: []resource.TestStep{
205-
{
206-
Config: testAccKubernetesJobConfig_ttl_seconds_after_finished(name, busyboxImageVersion),
207-
Check: resource.ComposeAggregateTestCheckFunc(
208-
testAccCheckKubernetesJobExists("kubernetes_job.test", &conf),
209-
resource.TestCheckResourceAttr("kubernetes_job.test", "spec.0.ttl_seconds_after_finished", "60"),
210-
),
211-
},
212-
},
213-
})
214-
}
192+
// FIXME uncomment this check when the TTLSecondsAfterFinished feature gate defaults to true
193+
//func TestAccKubernetesJob_ttl_seconds_after_finished(t *testing.T) {
194+
// var conf api.Job
195+
// name := fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(10, acctest.CharSetAlphaNum))
196+
//
197+
// resource.Test(t, resource.TestCase{
198+
// PreCheck: func() { testAccPreCheck(t) },
199+
// IDRefreshName: "kubernetes_job.test",
200+
// IDRefreshIgnore: []string{
201+
// "spec.0.selector.0.match_expressions.#",
202+
// },
203+
// ProviderFactories: testAccProviderFactories,
204+
// CheckDestroy: testAccCheckKubernetesJobDestroy,
205+
// Steps: []resource.TestStep{
206+
// {
207+
// Config: testAccKubernetesJobConfig_ttl_seconds_after_finished(name, busyboxImageVersion),
208+
// Check: resource.ComposeAggregateTestCheckFunc(
209+
// testAccCheckKubernetesJobExists("kubernetes_job.test", &conf),
210+
// resource.TestCheckResourceAttr("kubernetes_job.test", "spec.0.ttl_seconds_after_finished", "60"),
211+
// ),
212+
// },
213+
// },
214+
// })
215+
//}
215216

216217
func testAccCheckKubernetesJobForceNew(old, new *api.Job, wantNew bool) resource.TestCheckFunc {
217218
return func(s *terraform.State) error {

‎kubernetes/resource_kubernetes_pod_test.go‎

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"context"
55
"fmt"
66
"os"
7+
"regexp"
78
"testing"
89

910
api "k8s.io/api/core/v1"
@@ -693,10 +694,6 @@ func TestAccKubernetesPod_config_with_automount_service_account_token(t *testing
693694
testAccCheckKubernetesServiceAccountExists("kubernetes_service_account.test", &confSA),
694695
testAccCheckKubernetesPodExists("kubernetes_pod.test", &confPod),
695696
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.automount_service_account_token", "true"),
696-
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.container.0.volume_mount.#", "1"),
697-
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.container.0.volume_mount.0.mount_path", "/var/run/secrets/kubernetes.io/serviceaccount"),
698-
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.volume.#", "1"),
699-
resource.TestCheckResourceAttr("kubernetes_pod.test", "spec.0.volume.0.secret.#", "1"),
700697
),
701698
},
702699
},
@@ -873,17 +870,8 @@ func TestAccKubernetesPod_bug961EmptyBlocks(t *testing.T) {
873870
CheckDestroy: testAccCheckKubernetesPodDestroy,
874871
Steps: []resource.TestStep{
875872
{
876-
Config: testAccKubernetesPodConfigEmptyBlocks(name, busyboxImageVersion),
877-
Check: resource.ComposeAggregateTestCheckFunc(
878-
resource.TestCheckResourceAttrSet("kubernetes_pod.test", "metadata.0.generation"),
879-
resource.TestCheckResourceAttrSet("kubernetes_pod.test", "metadata.0.resource_version"),
880-
resource.TestCheckResourceAttrSet("kubernetes_pod.test", "metadata.0.uid"),
881-
resource.TestCheckResourceAttrSet("kubernetes_pod.test", "metadata.0.uid"),
882-
),
883-
},
884-
{
885-
Config: testAccKubernetesPodConfigMinimal(name, busyboxImageVersion),
886-
PlanOnly: true,
873+
ExpectError: regexp.MustCompile("Missing required argument"),
874+
Config: testAccKubernetesPodConfigEmptyBlocks(name, busyboxImageVersion),
887875
},
888876
},
889877
})

‎kubernetes/resource_kubernetes_service_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ func TestAccKubernetesService_generatedName(t *testing.T) {
515515
ResourceName: "kubernetes_service.test",
516516
ImportState: true,
517517
ImportStateVerify: true,
518-
ImportStateVerifyIgnore: []string{"metadata.0.resource_version"},
518+
ImportStateVerifyIgnore: []string{"metadata.0.resource_version", "wait_for_load_balancer"},
519519
},
520520
},
521521
})

‎kubernetes/resource_kubernetes_stateful_set_test.go‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,18 @@ func TestAccKubernetesStatefulSet_basic(t *testing.T) {
8888
),
8989
},
9090
{
91-
ResourceName: "kubernetes_stateful_set.test",
92-
ImportState: true,
93-
ImportStateVerify: true,
94-
ImportStateVerifyIgnore: []string{"wait_for_rollout"},
91+
ResourceName: "kubernetes_stateful_set.test",
92+
ImportState: true,
93+
ImportStateVerify: true,
94+
ImportStateVerifyIgnore: []string{
95+
"wait_for_rollout",
96+
"spec.0.update_strategy.#",
97+
"spec.0.update_strategy.0.%",
98+
"spec.0.update_strategy.0.rolling_update.#",
99+
"spec.0.update_strategy.0.rolling_update.0.%",
100+
"spec.0.update_strategy.0.rolling_update.0.partition",
101+
"spec.0.update_strategy.0.type",
102+
},
95103
},
96104
},
97105
})

0 commit comments

Comments
 (0)