Skip to content

Commit c895ce5

Browse files
dak1n1alexsomesan
dak1n1
authored and
alexsomesan
committed
Fix regression tests and remove self_link from metadata (#1110)
The regression tests which run StateUpgraders on the optional `resources {}` attribute have stopped working. This commit adds the `resources {}` attribute explicitly to each regression test, which allows the StateUpgrader to run. (This is only needed during acceptance tests, since the StateUpgrader is able to run during a manual terraform refresh or terraform apply). This also removes SelfLink from metadata, since that field is no longer populated as of Kubernetes version 1.20. (Otherwise, acceptance tests fail when running on 1.20).
1 parent a72f8e0 commit c895ce5

File tree

85 files changed

+387
-860
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+387
-860
lines changed

‎kubernetes/data_source_kubernetes_ingress_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestAccKubernetesDataSourceIngress_basic(t *testing.T) {
2121
resource.TestCheckResourceAttr("kubernetes_ingress.test", "metadata.0.name", name),
2222
resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.generation"),
2323
resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.resource_version"),
24-
resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.self_link"),
2524
resource.TestCheckResourceAttrSet("kubernetes_ingress.test", "metadata.0.uid"),
2625
resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.#", "1"),
2726
resource.TestCheckResourceAttr("kubernetes_ingress.test", "spec.0.backend.#", "1"),
@@ -43,7 +42,6 @@ func TestAccKubernetesDataSourceIngress_basic(t *testing.T) {
4342
resource.TestCheckResourceAttr("data.kubernetes_ingress.test", "metadata.0.name", name),
4443
resource.TestCheckResourceAttrSet("data.kubernetes_ingress.test", "metadata.0.generation"),
4544
resource.TestCheckResourceAttrSet("data.kubernetes_ingress.test", "metadata.0.resource_version"),
46-
resource.TestCheckResourceAttrSet("data.kubernetes_ingress.test", "metadata.0.self_link"),
4745
resource.TestCheckResourceAttrSet("data.kubernetes_ingress.test", "metadata.0.uid"),
4846
resource.TestCheckResourceAttr("data.kubernetes_ingress.test", "spec.#", "1"),
4947
resource.TestCheckResourceAttr("data.kubernetes_ingress.test", "spec.0.backend.#", "1"),

‎kubernetes/data_source_kubernetes_namespace_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ func TestAccKubernetesDataSourceNamespace_basic(t *testing.T) {
1717
resource.TestCheckResourceAttr("data.kubernetes_namespace.test", "metadata.0.name", "kube-system"),
1818
resource.TestCheckResourceAttrSet("data.kubernetes_namespace.test", "metadata.0.generation"),
1919
resource.TestCheckResourceAttrSet("data.kubernetes_namespace.test", "metadata.0.resource_version"),
20-
resource.TestCheckResourceAttrSet("data.kubernetes_namespace.test", "metadata.0.self_link"),
2120
resource.TestCheckResourceAttrSet("data.kubernetes_namespace.test", "metadata.0.uid"),
2221
resource.TestCheckResourceAttr("data.kubernetes_namespace.test", "spec.#", "1"),
2322
resource.TestCheckResourceAttr("data.kubernetes_namespace.test", "spec.0.finalizers.#", "1"),

‎kubernetes/data_source_kubernetes_persistent_volume_claim_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestAccKubernetesDataSourcePVC_basic(t *testing.T) {
2121
resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "metadata.0.name", name),
2222
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.generation"),
2323
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"),
24-
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.self_link"),
2524
resource.TestCheckResourceAttrSet("kubernetes_persistent_volume_claim.test", "metadata.0.uid"),
2625
resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"),
2726
resource.TestCheckResourceAttr("kubernetes_persistent_volume_claim.test", "spec.0.access_modes.0", "ReadWriteOnce"),
@@ -38,7 +37,6 @@ func TestAccKubernetesDataSourcePVC_basic(t *testing.T) {
3837
resource.TestCheckResourceAttr("data.kubernetes_persistent_volume_claim.test", "metadata.0.name", name),
3938
resource.TestCheckResourceAttrSet("data.kubernetes_persistent_volume_claim.test", "metadata.0.generation"),
4039
resource.TestCheckResourceAttrSet("data.kubernetes_persistent_volume_claim.test", "metadata.0.resource_version"),
41-
resource.TestCheckResourceAttrSet("data.kubernetes_persistent_volume_claim.test", "metadata.0.self_link"),
4240
resource.TestCheckResourceAttrSet("data.kubernetes_persistent_volume_claim.test", "metadata.0.uid"),
4341
resource.TestCheckResourceAttr("data.kubernetes_persistent_volume_claim.test", "spec.0.access_modes.#", "1"),
4442
resource.TestCheckResourceAttr("data.kubernetes_persistent_volume_claim.test", "spec.0.access_modes.0", "ReadWriteOnce"),

‎kubernetes/data_source_kubernetes_secret_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestAccKubernetesDataSourceSecret_basic(t *testing.T) {
2121
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.name", name),
2222
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.generation"),
2323
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.resource_version"),
24-
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.self_link"),
2524
resource.TestCheckResourceAttrSet("kubernetes_secret.test", "metadata.0.uid"),
2625
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.annotations.%", "2"),
2726
resource.TestCheckResourceAttr("kubernetes_secret.test", "metadata.0.annotations.TestAnnotationOne", "one"),
@@ -42,7 +41,6 @@ func TestAccKubernetesDataSourceSecret_basic(t *testing.T) {
4241
resource.TestCheckResourceAttr("data.kubernetes_secret.test", "metadata.0.name", name),
4342
resource.TestCheckResourceAttrSet("data.kubernetes_secret.test", "metadata.0.generation"),
4443
resource.TestCheckResourceAttrSet("data.kubernetes_secret.test", "metadata.0.resource_version"),
45-
resource.TestCheckResourceAttrSet("data.kubernetes_secret.test", "metadata.0.self_link"),
4644
resource.TestCheckResourceAttrSet("data.kubernetes_secret.test", "metadata.0.uid"),
4745
resource.TestCheckResourceAttr("data.kubernetes_secret.test", "metadata.0.annotations.%", "2"),
4846
resource.TestCheckResourceAttr("data.kubernetes_secret.test", "metadata.0.annotations.TestAnnotationOne", "one"),

‎kubernetes/data_source_kubernetes_service_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestAccKubernetesDataSourceService_basic(t *testing.T) {
2121
resource.TestCheckResourceAttr("kubernetes_service.test", "metadata.0.name", name),
2222
resource.TestCheckResourceAttrSet("kubernetes_service.test", "metadata.0.generation"),
2323
resource.TestCheckResourceAttrSet("kubernetes_service.test", "metadata.0.resource_version"),
24-
resource.TestCheckResourceAttrSet("kubernetes_service.test", "metadata.0.self_link"),
2524
resource.TestCheckResourceAttrSet("kubernetes_service.test", "metadata.0.uid"),
2625
resource.TestCheckResourceAttr("kubernetes_service.test", "spec.#", "1"),
2726
resource.TestCheckResourceAttr("kubernetes_service.test", "spec.0.port.#", "1"),
@@ -43,7 +42,6 @@ func TestAccKubernetesDataSourceService_basic(t *testing.T) {
4342
resource.TestCheckResourceAttr("data.kubernetes_service.test", "metadata.0.name", name),
4443
resource.TestCheckResourceAttrSet("data.kubernetes_service.test", "metadata.0.generation"),
4544
resource.TestCheckResourceAttrSet("data.kubernetes_service.test", "metadata.0.resource_version"),
46-
resource.TestCheckResourceAttrSet("data.kubernetes_service.test", "metadata.0.self_link"),
4745
resource.TestCheckResourceAttrSet("data.kubernetes_service.test", "metadata.0.uid"),
4846
resource.TestCheckResourceAttr("data.kubernetes_service.test", "spec.#", "1"),
4947
resource.TestCheckResourceAttr("data.kubernetes_service.test", "spec.0.port.#", "1"),

‎kubernetes/data_source_kubernetes_storage_class_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ func TestAccKubernetesDataSourceStorageClass_minikube(t *testing.T) {
2121
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.name", name),
2222
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.generation"),
2323
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.resource_version"),
24-
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.self_link"),
2524
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.uid"),
2625
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.annotations.%", "2"),
2726
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.annotations.TestAnnotationOne", "one"),
@@ -47,7 +46,6 @@ func TestAccKubernetesDataSourceStorageClass_minikube(t *testing.T) {
4746
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.name", name),
4847
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.generation"),
4948
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.resource_version"),
50-
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.self_link"),
5149
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.uid"),
5250
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.annotations.%", "2"),
5351
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.annotations.TestAnnotationOne", "one"),
@@ -83,7 +81,6 @@ func TestAccKubernetesDataSourceStorageClass_gke(t *testing.T) {
8381
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.name", name),
8482
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.generation"),
8583
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.resource_version"),
86-
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.self_link"),
8784
resource.TestCheckResourceAttrSet("kubernetes_storage_class.test", "metadata.0.uid"),
8885
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.annotations.%", "2"),
8986
resource.TestCheckResourceAttr("kubernetes_storage_class.test", "metadata.0.annotations.TestAnnotationOne", "one"),
@@ -109,7 +106,6 @@ func TestAccKubernetesDataSourceStorageClass_gke(t *testing.T) {
109106
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.name", name),
110107
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.generation"),
111108
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.resource_version"),
112-
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.self_link"),
113109
resource.TestCheckResourceAttrSet("data.kubernetes_storage_class.test", "metadata.0.uid"),
114110
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.annotations.%", "2"),
115111
resource.TestCheckResourceAttr("data.kubernetes_storage_class.test", "metadata.0.annotations.TestAnnotationOne", "one"),

‎kubernetes/resource_kubernetes_api_service_test.go‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ func TestAccKubernetesAPIService_basic(t *testing.T) {
2929
resource.TestCheckResourceAttr("kubernetes_api_service.test", "metadata.0.name", name),
3030
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.generation"),
3131
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.resource_version"),
32-
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.self_link"),
3332
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.uid"),
3433
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.#", "1"),
3534
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.0.service.#", "1"),
@@ -51,7 +50,6 @@ func TestAccKubernetesAPIService_basic(t *testing.T) {
5150
resource.TestCheckResourceAttr("kubernetes_api_service.test", "metadata.0.name", name),
5251
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.generation"),
5352
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.resource_version"),
54-
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.self_link"),
5553
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.uid"),
5654
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.#", "1"),
5755
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.0.service.#", "1"),
@@ -73,7 +71,6 @@ func TestAccKubernetesAPIService_basic(t *testing.T) {
7371
resource.TestCheckResourceAttr("kubernetes_api_service.test", "metadata.0.name", name),
7472
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.generation"),
7573
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.resource_version"),
76-
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.self_link"),
7774
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.uid"),
7875
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.#", "1"),
7976
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.0.service.#", "0"),
@@ -92,7 +89,6 @@ func TestAccKubernetesAPIService_basic(t *testing.T) {
9289
resource.TestCheckResourceAttr("kubernetes_api_service.test", "metadata.0.name", name),
9390
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.generation"),
9491
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.resource_version"),
95-
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.self_link"),
9692
resource.TestCheckResourceAttrSet("kubernetes_api_service.test", "metadata.0.uid"),
9793
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.#", "1"),
9894
resource.TestCheckResourceAttr("kubernetes_api_service.test", "spec.0.service.#", "1"),

0 commit comments

Comments
 (0)