Skip to content

Commit 4dbb03a

Browse files
ewbankkitewbankkit
authored
Merge pull request #43987 from myerscf/fix/update-eks-tests-with-spn-data-souce
Fix/update eks tests with spn data souce
2 parents 15729b8 + 5e812fc commit 4dbb03a

9 files changed

+144
-39
lines changed

‎internal/service/eks/access_entry_test.go‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,10 @@ func testAccAccessEntryConfig_base(rName string) string {
349349
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
350350
data "aws_partition" "current" {}
351351
352+
data "aws_service_principal" "eks" {
353+
service_name = "eks"
354+
}
355+
352356
resource "aws_iam_role" "test" {
353357
name = %[1]q
354358
@@ -359,7 +363,7 @@ resource "aws_iam_role" "test" {
359363
{
360364
"Effect": "Allow",
361365
"Principal": {
362-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
366+
"Service": "${data.aws_service_principal.eks.name}"
363367
},
364368
"Action": "sts:AssumeRole"
365369
}
@@ -472,7 +476,7 @@ resource "aws_iam_role" "test2" {
472476
{
473477
"Effect": "Allow",
474478
"Principal": {
475-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
479+
"Service": "${data.aws_service_principal.eks.name}"
476480
},
477481
"Action": "sts:AssumeRole"
478482
}
@@ -502,7 +506,7 @@ resource "aws_iam_role" "test2" {
502506
{
503507
"Effect": "Allow",
504508
"Principal": {
505-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
509+
"Service": "${data.aws_service_principal.eks.name}"
506510
},
507511
"Action": "sts:AssumeRole"
508512
}

‎internal/service/eks/access_policy_association_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,10 @@ func testAccAccessPolicyAssociationConfig_base(rName string) string {
172172
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
173173
data "aws_partition" "current" {}
174174
175+
data "aws_service_principal" "eks" {
176+
service_name = "eks"
177+
}
178+
175179
resource "aws_iam_role" "test" {
176180
name = %[1]q
177181
@@ -182,7 +186,7 @@ resource "aws_iam_role" "test" {
182186
{
183187
"Effect": "Allow",
184188
"Principal": {
185-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
189+
"Service": "${data.aws_service_principal.eks.name}"
186190
},
187191
"Action": "sts:AssumeRole"
188192
}

‎internal/service/eks/addon_data_source_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ data "aws_eks_addon" "test" {
9797
func testAccAddonDataSourceConfig_configurationValues(rName, addonName, addonVersion, configurationValues, resolveConflicts string) string {
9898
return acctest.ConfigCompose(testAccAddonConfig_base(rName), fmt.Sprintf(`
9999
resource "aws_eks_addon" "test" {
100-
cluster_name = aws_eks_cluster.test.name
101-
addon_name = %[2]q
102-
addon_version = %[3]q
103-
configuration_values = %[4]q
104-
resolve_conflicts = %[5]q
100+
cluster_name = aws_eks_cluster.test.name
101+
addon_name = %[2]q
102+
addon_version = %[3]q
103+
configuration_values = %[4]q
104+
resolve_conflicts_on_create = %[5]q
105105
}
106106
107107
data "aws_eks_addon" "test" {

‎internal/service/eks/addon_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,10 @@ func testAccAddonConfig_base(rName string) string {
480480
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
481481
data "aws_partition" "current" {}
482482
483+
data "aws_service_principal" "eks" {
484+
service_name = "eks"
485+
}
486+
483487
resource "aws_iam_role" "test" {
484488
name = %[1]q
485489
@@ -490,7 +494,7 @@ resource "aws_iam_role" "test" {
490494
{
491495
"Effect": "Allow",
492496
"Principal": {
493-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
497+
"Service": "${data.aws_service_principal.eks.name}"
494498
},
495499
"Action": "sts:AssumeRole"
496500
}

‎internal/service/eks/addon_version_data_source_test.go‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,10 @@ data "aws_eks_addon_version" "test" {
5454
}
5555
5656
resource "aws_eks_addon" "test" {
57-
addon_name = %[2]q
58-
cluster_name = aws_eks_cluster.test.name
59-
addon_version = data.aws_eks_addon_version.test.version
60-
61-
resolve_conflicts = "OVERWRITE"
57+
addon_name = %[2]q
58+
cluster_name = aws_eks_cluster.test.name
59+
addon_version = data.aws_eks_addon_version.test.version
60+
resolve_conflicts_on_create = "OVERWRITE"
6261
}
6362
6463
data "aws_eks_addon" "test" {

‎internal/service/eks/cluster_test.go‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,17 @@ import (
2929
)
3030

3131
const (
32-
clusterVersionUpgradeInitial = "1.27"
33-
clusterVersionUpgradeUpdated = "1.28"
32+
clusterVersion130 = "1.30"
33+
clusterVersion131 = "1.31"
34+
clusterVersion132 = "1.32"
3435

35-
clusterVersionUpgradeForceInitial = "1.30"
36-
clusterVersionUpgradeForceUpdated = "1.31"
36+
clusterDefaultVersion = clusterVersion132
37+
38+
clusterVersionUpgradeInitial = clusterVersion130
39+
clusterVersionUpgradeUpdated = clusterVersion131
40+
41+
clusterVersionUpgradeForceInitial = clusterVersion130
42+
clusterVersionUpgradeForceUpdated = clusterVersion131
3743
)
3844

3945
func TestAccEKSCluster_basic(t *testing.T) {
@@ -275,13 +281,13 @@ func TestAccEKSCluster_BootstrapSelfManagedAddons_migrate(t *testing.T) {
275281
ExternalProviders: map[string]resource.ExternalProvider{
276282
"aws": {
277283
Source: "hashicorp/aws",
278-
VersionConstraint: "5.56.1",
284+
VersionConstraint: "6.9.0",
279285
},
280286
},
281287
Config: testAccClusterConfig_basic(rName),
282288
Check: resource.ComposeAggregateTestCheckFunc(
283289
testAccCheckClusterExists(ctx, resourceName, &cluster1),
284-
resource.TestCheckNoResourceAttr(resourceName, "bootstrap_self_managed_addons"),
290+
resource.TestCheckResourceAttr(resourceName, "bootstrap_self_managed_addons", acctest.CtTrue),
285291
),
286292
},
287293
{
@@ -1362,11 +1368,11 @@ func TestAccEKSCluster_upgradePolicy(t *testing.T) {
13621368
CheckDestroy: testAccCheckClusterDestroy(ctx),
13631369
Steps: []resource.TestStep{
13641370
{
1365-
Config: testAccClusterConfig_upgradePolicy(rName, "STANDARD"),
1371+
Config: testAccClusterConfig_upgradePolicy(rName, "EXTENDED"),
13661372
Check: resource.ComposeAggregateTestCheckFunc(
13671373
testAccCheckClusterExists(ctx, resourceName, &cluster),
13681374
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.#", "1"),
1369-
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "STANDARD"),
1375+
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "EXTENDED"),
13701376
),
13711377
},
13721378
{
@@ -1376,11 +1382,11 @@ func TestAccEKSCluster_upgradePolicy(t *testing.T) {
13761382
ImportStateVerifyIgnore: []string{"bootstrap_self_managed_addons"},
13771383
},
13781384
{
1379-
Config: testAccClusterConfig_upgradePolicy(rName, "EXTENDED"),
1385+
Config: testAccClusterConfig_upgradePolicy(rName, "STANDARD"),
13801386
Check: resource.ComposeAggregateTestCheckFunc(
13811387
testAccCheckClusterExists(ctx, resourceName, &cluster),
13821388
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.#", "1"),
1383-
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "EXTENDED"),
1389+
resource.TestCheckResourceAttr(resourceName, "upgrade_policy.0.support_type", "STANDARD"),
13841390
),
13851391
},
13861392
{
@@ -1558,6 +1564,10 @@ func testAccClusterConfig_base(rName string) string {
15581564
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
15591565
data "aws_partition" "current" {}
15601566
1567+
data "aws_service_principal" "eks" {
1568+
service_name = "eks"
1569+
}
1570+
15611571
resource "aws_iam_role" "cluster" {
15621572
name = %[1]q
15631573
@@ -1568,7 +1578,7 @@ resource "aws_iam_role" "cluster" {
15681578
{
15691579
"Effect": "Allow",
15701580
"Principal": {
1571-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
1581+
"Service": "${data.aws_service_principal.eks.name}"
15721582
},
15731583
"Action": "sts:AssumeRole"
15741584
}
@@ -1666,6 +1676,10 @@ func testAccClusterConfig_computeConfigBase(rName string) string {
16661676
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
16671677
data "aws_partition" "current" {}
16681678
1679+
data "aws_service_principal" "eks" {
1680+
service_name = "eks"
1681+
}
1682+
16691683
resource "aws_iam_role" "cluster" {
16701684
name = %[1]q
16711685
@@ -1676,7 +1690,7 @@ resource "aws_iam_role" "cluster" {
16761690
{
16771691
"Effect": "Allow",
16781692
"Principal": {
1679-
"Service": "eks.${data.aws_partition.current.dns_suffix}"
1693+
"Service": "${data.aws_service_principal.eks.name}"
16801694
},
16811695
"Action": [
16821696
"sts:AssumeRole",
@@ -1713,6 +1727,10 @@ resource "aws_iam_role_policy_attachment" "cluster_AmazonEKSNetworkingPolicy" {
17131727
role = aws_iam_role.cluster.name
17141728
}
17151729
1730+
data "aws_service_principal" "ec2" {
1731+
service_name = "ec2"
1732+
}
1733+
17161734
resource "aws_iam_role" "node" {
17171735
name = "%[1]s-node"
17181736
@@ -1723,7 +1741,7 @@ resource "aws_iam_role" "node" {
17231741
{
17241742
"Effect": "Allow",
17251743
"Principal": {
1726-
"Service": "ec2.${data.aws_partition.current.dns_suffix}"
1744+
"Service": "${data.aws_service_principal.ec2.name}"
17271745
},
17281746
"Action": ["sts:AssumeRole"]
17291747
}
@@ -1752,7 +1770,7 @@ resource "aws_iam_role" "node2" {
17521770
{
17531771
"Effect": "Allow",
17541772
"Principal": {
1755-
"Service": "ec2.${data.aws_partition.current.dns_suffix}"
1773+
"Service": "${data.aws_service_principal.ec2.name}"
17561774
},
17571775
"Action": ["sts:AssumeRole"]
17581776
}

‎internal/service/eks/fargate_profile_test.go‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ data "aws_availability_zones" "available" {
273273
274274
data "aws_partition" "current" {}
275275
276+
data "aws_service_principal" "eks" {
277+
service_name = "eks"
278+
}
279+
276280
resource "aws_iam_role" "cluster" {
277281
name = "%[1]s-cluster"
278282
@@ -281,7 +285,7 @@ resource "aws_iam_role" "cluster" {
281285
Action = "sts:AssumeRole"
282286
Effect = "Allow"
283287
Principal = {
284-
Service = "eks.${data.aws_partition.current.dns_suffix}"
288+
Service = data.aws_service_principal.eks.name
285289
}
286290
}]
287291
Version = "2012-10-17"
@@ -293,6 +297,10 @@ resource "aws_iam_role_policy_attachment" "cluster-AmazonEKSClusterPolicy" {
293297
role = aws_iam_role.cluster.name
294298
}
295299
300+
data "aws_service_principal" "eks_fargate_pods" {
301+
service_name = "eks-fargate-pods"
302+
}
303+
296304
resource "aws_iam_role" "pod" {
297305
name = "%[1]s-pod"
298306
@@ -301,7 +309,7 @@ resource "aws_iam_role" "pod" {
301309
Action = "sts:AssumeRole"
302310
Effect = "Allow"
303311
Principal = {
304-
Service = "eks-fargate-pods.${data.aws_partition.current.dns_suffix}"
312+
Service = data.aws_service_principal.eks_fargate_pods.name
305313
}
306314
}]
307315
Version = "2012-10-17"

‎internal/service/eks/identity_provider_config_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,10 @@ func testAccIdentityProviderBaseConfig(rName string) string {
233233
return acctest.ConfigCompose(acctest.ConfigAvailableAZsNoOptIn(), fmt.Sprintf(`
234234
data "aws_partition" "current" {}
235235
236+
data "aws_service_principal" "eks" {
237+
service_name = "eks"
238+
}
239+
236240
resource "aws_iam_role" "test" {
237241
name = %[1]q
238242
@@ -241,7 +245,7 @@ resource "aws_iam_role" "test" {
241245
Action = "sts:AssumeRole"
242246
Effect = "Allow"
243247
Principal = {
244-
Service = "eks.${data.aws_partition.current.dns_suffix}"
248+
Service = data.aws_service_principal.eks.name
245249
}
246250
}]
247251
Version = "2012-10-17"

0 commit comments

Comments
 (0)