Skip to content

Commit 0ed3e50

Browse files
mattburgessmattburgess
authored
tests/provider: Enable S1039 check for unnecessary fmt.Sprint()/fmt.Sprintf() usage (#16741)
1 parent eb5174a commit 0ed3e50

File tree

40 files changed

+256
-259
lines changed

40 files changed

+256
-259
lines changed

‎.golangci.yml

-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
issues:
22
exclude-rules:
3-
- linters:
4-
- gosimple
5-
text: "S1039:"
6-
73
# Exclude issues bypassing staticcheck.conf
84
- linters:
95
- staticcheck

‎aws/data_source_aws_autoscaling_group_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func testAccAutoScalingGroupDataResourceConfig_launchTemplate() string {
124124
testAccLatestAmazonLinuxHvmEbsAmiConfig(),
125125
testAccAvailableAZsNoOptInConfig(),
126126
testAccAvailableEc2InstanceTypeForAvailabilityZone("data.aws_availability_zones.available.names[0]", "t3.micro", "t2.micro"),
127-
fmt.Sprintf(`
127+
`
128128
data "aws_autoscaling_group" "test" {
129129
name = aws_autoscaling_group.test.name
130130
}
@@ -145,5 +145,5 @@ resource "aws_launch_template" "test" {
145145
image_id = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
146146
instance_type = data.aws_ec2_instance_type_offering.available.instance_type
147147
}
148-
`))
148+
`)
149149
}

‎aws/data_source_aws_codeartifact_authorization_token_test.go

+9-6
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,19 @@ resource "aws_codeartifact_domain" "test" {
8585
}
8686

8787
func testAccCheckAWSCodeArtifactAuthorizationTokenBasicConfig(rName string) string {
88-
return testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName) +
89-
fmt.Sprintf(`
88+
return composeConfig(
89+
testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName),
90+
`
9091
data "aws_codeartifact_authorization_token" "test" {
9192
domain = aws_codeartifact_domain.test.domain
9293
}
9394
`)
9495
}
9596

9697
func testAccCheckAWSCodeArtifactAuthorizationTokenOwnerConfig(rName string) string {
97-
return testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName) +
98-
fmt.Sprintf(`
98+
return composeConfig(
99+
testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName),
100+
`
99101
data "aws_codeartifact_authorization_token" "test" {
100102
domain = aws_codeartifact_domain.test.domain
101103
domain_owner = aws_codeartifact_domain.test.owner
@@ -104,8 +106,9 @@ data "aws_codeartifact_authorization_token" "test" {
104106
}
105107

106108
func testAccCheckAWSCodeArtifactAuthorizationTokenDurationConfig(rName string) string {
107-
return testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName) +
108-
fmt.Sprintf(`
109+
return composeConfig(
110+
testAccCheckAWSCodeArtifactAuthorizationTokenBaseConfig(rName),
111+
`
109112
data "aws_codeartifact_authorization_token" "test" {
110113
domain = aws_codeartifact_domain.test.domain
111114
duration_seconds = 900

‎aws/data_source_aws_codeartifact_repository_endpoint_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ data "aws_codeartifact_repository_endpoint" "test" {
102102
func testAccCheckAWSCodeArtifactRepositoryEndpointOwnerConfig(rName string) string {
103103
return composeConfig(
104104
testAccCheckAWSCodeArtifactRepositoryEndpointBaseConfig(rName),
105-
fmt.Sprintf(`
105+
`
106106
data "aws_codeartifact_repository_endpoint" "test" {
107107
domain = aws_codeartifact_domain.test.domain
108108
repository = aws_codeartifact_repository.test.repository
109109
domain_owner = aws_codeartifact_domain.test.owner
110110
format = "npm"
111111
}
112-
`))
112+
`)
113113
}

‎aws/data_source_aws_directory_service_directory_test.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,8 @@ data "aws_directory_service_directory" "test-microsoft-ad" {
197197
}
198198

199199
func testAccDataSourceDirectoryServiceDirectoryConfig_connector() string {
200-
return composeConfig(testAccAvailableAZsNoOptInConfig(), fmt.Sprintf(`
200+
return composeConfig(testAccAvailableAZsNoOptInConfig(),
201+
`
201202
resource "aws_directory_service_directory" "test" {
202203
name = "corp.notexample.com"
203204
password = "SuperSecretPassw0rd"
@@ -254,5 +255,5 @@ resource "aws_subnet" "test" {
254255
data "aws_directory_service_directory" "test-ad-connector" {
255256
directory_id = aws_directory_service_directory.connector.id
256257
}
257-
`))
258+
`)
258259
}

‎aws/data_source_aws_docdb_engine_version_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ data "aws_docdb_engine_version" "test" {
103103
}
104104

105105
func testAccAWSDocDBEngineVersionDataSourcePreferredConfig() string {
106-
return fmt.Sprintf(`
106+
return `
107107
data "aws_docdb_engine_version" "test" {
108108
preferred_versions = ["34.6.1", "3.6.0", "2.6.0"]
109109
}
110-
`)
110+
`
111111
}
112112

113113
func testAccAWSDocDBEngineVersionDataSourceDefaultOnlyConfig() string {
114-
return fmt.Sprintf(`
114+
return `
115115
data "aws_docdb_engine_version" "test" {}
116-
`)
116+
`
117117
}

‎aws/data_source_aws_ebs_snapshot_ids_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestAccDataSourceAwsEbsSnapshotIds_empty(t *testing.T) {
7171
}
7272

7373
func testAccDataSourceAwsEbsSnapshotIdsConfig_basic() string {
74-
return composeConfig(testAccAvailableAZsNoOptInConfig(), fmt.Sprintf(`
74+
return composeConfig(testAccAvailableAZsNoOptInConfig(), `
7575
resource "aws_ebs_volume" "test" {
7676
availability_zone = data.aws_availability_zones.available.names[0]
7777
size = 1
@@ -84,7 +84,7 @@ resource "aws_ebs_snapshot" "test" {
8484
data "aws_ebs_snapshot_ids" "test" {
8585
owners = ["self"]
8686
}
87-
`))
87+
`)
8888
}
8989

9090
func testAccDataSourceAwsEbsSnapshotIdsConfig_sorted1(rName string) string {

‎aws/data_source_aws_ec2_spot_price_test.go

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package aws
22

33
import (
4-
"fmt"
54
"regexp"
65
"testing"
76

@@ -67,7 +66,7 @@ func testAccPreCheckAwsEc2SpotPrice(t *testing.T) {
6766
}
6867

6968
func testAccAwsEc2SpotPriceDataSourceConfig() string {
70-
return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
69+
return composeConfig(testAccAvailableAZsNoOptInConfig(), `
7170
data "aws_region" "current" {}
7271
7372
data "aws_ec2_instance_type_offering" "test" {
@@ -91,7 +90,7 @@ data "aws_ec2_spot_price" "test" {
9190
}
9291

9392
func testAccAwsEc2SpotPriceDataSourceFilterConfig() string {
94-
return testAccAvailableAZsNoOptInConfig() + fmt.Sprintf(`
93+
return composeConfig(testAccAvailableAZsNoOptInConfig(), `
9594
data "aws_region" "current" {}
9695
9796
data "aws_ec2_instance_type_offering" "test" {

‎aws/data_source_aws_instance_test.go

+11-10
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,8 @@ data "aws_instance" "test" {
575575
}
576576

577577
// filter on tag, populate more attributes
578-
var testAccInstanceDataSourceConfig_AzUserData = testAccAvailableAZsNoOptInDefaultExcludeConfig() +
579-
testAccLatestAmazonLinuxHvmEbsAmiConfig() + fmt.Sprintf(`
578+
var testAccInstanceDataSourceConfig_AzUserData = composeConfig(testAccAvailableAZsNoOptInDefaultExcludeConfig(),
579+
testAccLatestAmazonLinuxHvmEbsAmiConfig(), `
580580
resource "aws_instance" "test" {
581581
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
582582
availability_zone = data.aws_availability_zones.available.names[0]
@@ -738,7 +738,7 @@ data "aws_instance" "test" {
738738
`
739739

740740
func testAccInstanceDataSourceConfig_privateIP(rName string) string {
741-
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfigBasic(rName) + fmt.Sprintf(`
741+
return composeConfig(testAccLatestAmazonLinuxHvmEbsAmiConfig(), testAccAwsInstanceVpcConfigBasic(rName), `
742742
resource "aws_instance" "test" {
743743
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
744744
instance_type = "t2.micro"
@@ -753,7 +753,7 @@ data "aws_instance" "test" {
753753
}
754754

755755
func testAccInstanceDataSourceConfig_secondaryPrivateIPs(rName string) string {
756-
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfigBasic(rName) + fmt.Sprintf(`
756+
return composeConfig(testAccLatestAmazonLinuxHvmEbsAmiConfig(), testAccAwsInstanceVpcConfigBasic(rName), `
757757
resource "aws_instance" "test" {
758758
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
759759
instance_type = "t2.micro"
@@ -799,7 +799,7 @@ data "aws_instance" "test" {
799799
}
800800

801801
func testAccInstanceDataSourceConfig_VPC(rName string) string {
802-
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfigBasic(rName) + fmt.Sprintf(`
802+
return composeConfig(testAccLatestAmazonLinuxHvmEbsAmiConfig(), testAccAwsInstanceVpcConfigBasic(rName), `
803803
resource "aws_instance" "test" {
804804
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
805805
instance_type = "t2.small"
@@ -869,10 +869,10 @@ data "aws_instance" "test" {
869869
}
870870

871871
func testAccInstanceDataSourceConfig_VPCSecurityGroups(rName string) string {
872-
return testAccLatestAmazonLinuxHvmEbsAmiConfig() +
873-
testAccAwsInstanceVpcConfigBasic(rName) +
874-
testAccAwsInstanceVpcSecurityGroupConfig(rName) +
875-
fmt.Sprintf(`
872+
return composeConfig(testAccLatestAmazonLinuxHvmEbsAmiConfig(),
873+
testAccAwsInstanceVpcConfigBasic(rName),
874+
testAccAwsInstanceVpcSecurityGroupConfig(rName),
875+
`
876876
resource "aws_instance" "test" {
877877
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
878878
instance_type = "t2.micro"
@@ -945,7 +945,8 @@ data "aws_instance" "test" {
945945
}
946946

947947
func testAccInstanceDataSourceConfig_creditSpecification(rName string) string {
948-
return testAccLatestAmazonLinuxHvmEbsAmiConfig() + testAccAwsInstanceVpcConfigBasic(rName) + fmt.Sprintf(`
948+
return composeConfig(testAccLatestAmazonLinuxHvmEbsAmiConfig(),
949+
testAccAwsInstanceVpcConfigBasic(rName), `
949950
resource "aws_instance" "test" {
950951
ami = data.aws_ami.amzn-ami-minimal-hvm-ebs.id
951952
instance_type = "t2.micro"

‎aws/data_source_aws_neptune_engine_version_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,15 @@ data "aws_neptune_engine_version" "test" {
105105
}
106106

107107
func testAccAWSNeptuneEngineVersionDataSourcePreferredConfig() string {
108-
return fmt.Sprintf(`
108+
return `
109109
data "aws_neptune_engine_version" "test" {
110110
preferred_versions = ["85.9.12", "1.0.3.0", "1.0.2.2"]
111111
}
112-
`)
112+
`
113113
}
114114

115115
func testAccAWSNeptuneEngineVersionDataSourceDefaultOnlyConfig() string {
116-
return fmt.Sprintf(`
116+
return `
117117
data "aws_neptune_engine_version" "test" {}
118-
`)
118+
`
119119
}

‎aws/data_source_aws_rds_engine_version_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -131,27 +131,27 @@ data "aws_rds_engine_version" "test" {
131131
}
132132

133133
func testAccAWSRDSEngineVersionDataSourceUpgradeTargetsConfig() string {
134-
return fmt.Sprintf(`
134+
return `
135135
data "aws_rds_engine_version" "test" {
136136
engine = "mysql"
137137
version = "5.7.17"
138138
}
139-
`)
139+
`
140140
}
141141

142142
func testAccAWSRDSEngineVersionDataSourcePreferredConfig() string {
143-
return fmt.Sprintf(`
143+
return `
144144
data "aws_rds_engine_version" "test" {
145145
engine = "mysql"
146146
preferred_versions = ["85.9.12", "5.7.19", "5.7.17"]
147147
}
148-
`)
148+
`
149149
}
150150

151151
func testAccAWSRDSEngineVersionDataSourceDefaultOnlyConfig() string {
152-
return fmt.Sprintf(`
152+
return `
153153
data "aws_rds_engine_version" "test" {
154154
engine = "mysql"
155155
}
156-
`)
156+
`
157157
}

‎aws/data_source_aws_rds_orderable_db_instance_test.go

+14-14
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ data "aws_rds_orderable_db_instance" "test" {
310310
}
311311

312312
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsEnhancedMonitoring() string {
313-
return fmt.Sprintf(`
313+
return `
314314
data "aws_rds_orderable_db_instance" "test" {
315315
engine = "mysql"
316316
license_model = "general-public-license"
@@ -320,11 +320,11 @@ data "aws_rds_orderable_db_instance" "test" {
320320
preferred_engine_versions = ["5.6.35", "5.6.41", "5.6.44"]
321321
preferred_instance_classes = ["db.t2.small", "db.t3.medium", "db.t3.large"]
322322
}
323-
`)
323+
`
324324
}
325325

326326
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsIAMDatabaseAuthentication() string {
327-
return fmt.Sprintf(`
327+
return `
328328
data "aws_rds_orderable_db_instance" "test" {
329329
engine = "mysql"
330330
license_model = "general-public-license"
@@ -334,11 +334,11 @@ data "aws_rds_orderable_db_instance" "test" {
334334
preferred_engine_versions = ["5.6.35", "5.6.41", "5.6.44"]
335335
preferred_instance_classes = ["db.t2.small", "db.t3.medium", "db.t3.large"]
336336
}
337-
`)
337+
`
338338
}
339339

340340
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsIops() string {
341-
return fmt.Sprintf(`
341+
return `
342342
data "aws_rds_orderable_db_instance" "test" {
343343
engine = "mysql"
344344
license_model = "general-public-license"
@@ -347,11 +347,11 @@ data "aws_rds_orderable_db_instance" "test" {
347347
preferred_engine_versions = ["8.0.20", "8.0.19", "8.0.17"]
348348
preferred_instance_classes = ["db.t3.small", "db.t2.xlarge", "db.t2.small"]
349349
}
350-
`)
350+
`
351351
}
352352

353353
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsKerberosAuthentication() string {
354-
return fmt.Sprintf(`
354+
return `
355355
data "aws_rds_orderable_db_instance" "test" {
356356
engine = "postgres"
357357
license_model = "postgresql-license"
@@ -361,11 +361,11 @@ data "aws_rds_orderable_db_instance" "test" {
361361
preferred_engine_versions = ["12.3", "11.1", "10.13"]
362362
preferred_instance_classes = ["db.m5.xlarge", "db.r5.large", "db.t3.large"]
363363
}
364-
`)
364+
`
365365
}
366366

367367
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsPerformanceInsights() string {
368-
return fmt.Sprintf(`
368+
return `
369369
data "aws_rds_orderable_db_instance" "test" {
370370
engine = "mysql"
371371
license_model = "general-public-license"
@@ -374,11 +374,11 @@ data "aws_rds_orderable_db_instance" "test" {
374374
preferred_engine_versions = ["5.6.35", "5.6.41", "5.6.44"]
375375
preferred_instance_classes = ["db.t2.small", "db.t3.medium", "db.t3.large"]
376376
}
377-
`)
377+
`
378378
}
379379

380380
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsStorageAutoscaling() string {
381-
return fmt.Sprintf(`
381+
return `
382382
data "aws_rds_orderable_db_instance" "test" {
383383
engine = "mysql"
384384
license_model = "general-public-license"
@@ -387,11 +387,11 @@ data "aws_rds_orderable_db_instance" "test" {
387387
preferred_engine_versions = ["8.0.20", "8.0.19", "5.7.30"]
388388
preferred_instance_classes = ["db.t3.medium", "db.t2.large", "db.t3.xlarge"]
389389
}
390-
`)
390+
`
391391
}
392392

393393
func testAccAWSRdsOrderableDbInstanceDataSourceConfig_supportsStorageEncryption() string {
394-
return fmt.Sprintf(`
394+
return `
395395
data "aws_rds_orderable_db_instance" "test" {
396396
engine = "mysql"
397397
license_model = "general-public-license"
@@ -401,5 +401,5 @@ data "aws_rds_orderable_db_instance" "test" {
401401
preferred_engine_versions = ["5.6.35", "5.6.41", "5.6.44"]
402402
preferred_instance_classes = ["db.t2.small", "db.t3.medium", "db.t3.large"]
403403
}
404-
`)
404+
`
405405
}

‎aws/data_source_aws_route_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ data "aws_route" "test" {
250250
}
251251

252252
func testAccAWSRouteDataSourceConfigLocalGatewayID() string {
253-
return fmt.Sprintf(`
253+
return `
254254
data "aws_ec2_local_gateways" "all" {}
255255
data "aws_ec2_local_gateway" "first" {
256256
id = tolist(data.aws_ec2_local_gateways.all.ids)[0]
@@ -286,5 +286,5 @@ data "aws_route" "by_local_gateway_id" {
286286
local_gateway_id = data.aws_ec2_local_gateway.first.id
287287
depends_on = [aws_route.test]
288288
}
289-
`)
289+
`
290290
}

0 commit comments

Comments
 (0)