Skip to content

Commit 97f90cd

Browse files
ewbankkitewbankkit
authored
Merge pull request #28084 from hashicorp/f-resource-explorer-service
Add Resource Explorer service client
2 parents cea997e + eb76028 commit 97f90cd

34 files changed

+956
-940
lines changed

‎.changelog/28084.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:note
2+
provider: With AWS's retirement of EC2-Classic the `skip_get_ec2_platforms` attribute has been deprecated and will be removed in a future version
3+
```

‎.ci/.semgrep-service-name0.yml

+15
Original file line numberDiff line numberDiff line change
@@ -3144,3 +3144,18 @@ rules:
31443144
- pattern-not-regex: "^TestAccConnect"
31453145
- pattern-regex: ^TestAcc.*
31463146
severity: WARNING
3147+
- id: connect-in-const-name
3148+
languages:
3149+
- go
3150+
message: Do not use "Connect" in const name inside connect package
3151+
paths:
3152+
include:
3153+
- internal/service/connect
3154+
patterns:
3155+
- pattern: const $NAME = ...
3156+
- metavariable-pattern:
3157+
metavariable: $NAME
3158+
patterns:
3159+
- pattern-regex: "(?i)Connect"
3160+
- pattern-not-regex: .*uickConnect.*
3161+
severity: WARNING

‎.ci/.semgrep-service-name1.yml

+30-15
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
22
rules:
3-
- id: connect-in-const-name
4-
languages:
5-
- go
6-
message: Do not use "Connect" in const name inside connect package
7-
paths:
8-
include:
9-
- internal/service/connect
10-
patterns:
11-
- pattern: const $NAME = ...
12-
- metavariable-pattern:
13-
metavariable: $NAME
14-
patterns:
15-
- pattern-regex: "(?i)Connect"
16-
- pattern-not-regex: .*uickConnect.*
17-
severity: WARNING
183
- id: connect-in-var-name
194
languages:
205
- go
@@ -3131,3 +3116,33 @@ rules:
31313116
patterns:
31323117
- pattern-regex: "(?i)Inspector"
31333118
severity: WARNING
3119+
- id: inspector2-in-func-name
3120+
languages:
3121+
- go
3122+
message: Do not use "Inspector2" in func name inside inspector2 package
3123+
paths:
3124+
include:
3125+
- internal/service/inspector2
3126+
patterns:
3127+
- pattern: func $NAME( ... ) { ... }
3128+
- metavariable-pattern:
3129+
metavariable: $NAME
3130+
patterns:
3131+
- pattern-regex: "(?i)Inspector2"
3132+
- pattern-not-regex: ^TestAcc.*
3133+
severity: WARNING
3134+
- id: inspector2-in-test-name
3135+
languages:
3136+
- go
3137+
message: Include "Inspector2" in test name
3138+
paths:
3139+
include:
3140+
- internal/service/inspector2/*_test.go
3141+
patterns:
3142+
- pattern: func $NAME( ... ) { ... }
3143+
- metavariable-pattern:
3144+
metavariable: $NAME
3145+
patterns:
3146+
- pattern-not-regex: "^TestAccInspector2"
3147+
- pattern-regex: ^TestAcc.*
3148+
severity: WARNING

‎.ci/.semgrep-service-name2.yml

+43-30
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,5 @@
11
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
22
rules:
3-
- id: inspector2-in-func-name
4-
languages:
5-
- go
6-
message: Do not use "Inspector2" in func name inside inspector2 package
7-
paths:
8-
include:
9-
- internal/service/inspector2
10-
patterns:
11-
- pattern: func $NAME( ... ) { ... }
12-
- metavariable-pattern:
13-
metavariable: $NAME
14-
patterns:
15-
- pattern-regex: "(?i)Inspector2"
16-
- pattern-not-regex: ^TestAcc.*
17-
severity: WARNING
18-
- id: inspector2-in-test-name
19-
languages:
20-
- go
21-
message: Include "Inspector2" in test name
22-
paths:
23-
include:
24-
- internal/service/inspector2/*_test.go
25-
patterns:
26-
- pattern: func $NAME( ... ) { ... }
27-
- metavariable-pattern:
28-
metavariable: $NAME
29-
patterns:
30-
- pattern-not-regex: "^TestAccInspector2"
31-
- pattern-regex: ^TestAcc.*
32-
severity: WARNING
333
- id: inspector2-in-const-name
344
languages:
355
- go
@@ -3128,3 +3098,46 @@ rules:
31283098
- pattern-regex: "(?i)Redshift"
31293099
- pattern-not-regex: ^TestAcc.*
31303100
severity: WARNING
3101+
- id: redshift-in-test-name
3102+
languages:
3103+
- go
3104+
message: Include "Redshift" in test name
3105+
paths:
3106+
include:
3107+
- internal/service/redshift/*_test.go
3108+
patterns:
3109+
- pattern: func $NAME( ... ) { ... }
3110+
- metavariable-pattern:
3111+
metavariable: $NAME
3112+
patterns:
3113+
- pattern-not-regex: "^TestAccRedshift"
3114+
- pattern-regex: ^TestAcc.*
3115+
severity: WARNING
3116+
- id: redshift-in-const-name
3117+
languages:
3118+
- go
3119+
message: Do not use "Redshift" in const name inside redshift package
3120+
paths:
3121+
include:
3122+
- internal/service/redshift
3123+
patterns:
3124+
- pattern: const $NAME = ...
3125+
- metavariable-pattern:
3126+
metavariable: $NAME
3127+
patterns:
3128+
- pattern-regex: "(?i)Redshift"
3129+
severity: WARNING
3130+
- id: redshift-in-var-name
3131+
languages:
3132+
- go
3133+
message: Do not use "Redshift" in var name inside redshift package
3134+
paths:
3135+
include:
3136+
- internal/service/redshift
3137+
patterns:
3138+
- pattern: var $NAME = ...
3139+
- metavariable-pattern:
3140+
metavariable: $NAME
3141+
patterns:
3142+
- pattern-regex: "(?i)Redshift"
3143+
severity: WARNING

‎.ci/.semgrep-service-name3.yml

+58-43
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,5 @@
11
# Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
22
rules:
3-
- id: redshift-in-test-name
4-
languages:
5-
- go
6-
message: Include "Redshift" in test name
7-
paths:
8-
include:
9-
- internal/service/redshift/*_test.go
10-
patterns:
11-
- pattern: func $NAME( ... ) { ... }
12-
- metavariable-pattern:
13-
metavariable: $NAME
14-
patterns:
15-
- pattern-not-regex: "^TestAccRedshift"
16-
- pattern-regex: ^TestAcc.*
17-
severity: WARNING
18-
- id: redshift-in-const-name
19-
languages:
20-
- go
21-
message: Do not use "Redshift" in const name inside redshift package
22-
paths:
23-
include:
24-
- internal/service/redshift
25-
patterns:
26-
- pattern: const $NAME = ...
27-
- metavariable-pattern:
28-
metavariable: $NAME
29-
patterns:
30-
- pattern-regex: "(?i)Redshift"
31-
severity: WARNING
32-
- id: redshift-in-var-name
33-
languages:
34-
- go
35-
message: Do not use "Redshift" in var name inside redshift package
36-
paths:
37-
include:
38-
- internal/service/redshift
39-
patterns:
40-
- pattern: var $NAME = ...
41-
- metavariable-pattern:
42-
metavariable: $NAME
43-
patterns:
44-
- pattern-regex: "(?i)Redshift"
45-
severity: WARNING
463
- id: redshiftdata-in-func-name
474
languages:
485
- go
@@ -202,6 +159,64 @@ rules:
202159
patterns:
203160
- pattern-regex: "(?i)RedshiftServerless"
204161
severity: WARNING
162+
- id: resourceexplorer2-in-func-name
163+
languages:
164+
- go
165+
message: Do not use "ResourceExplorer2" in func name inside resourceexplorer2 package
166+
paths:
167+
include:
168+
- internal/service/resourceexplorer2
169+
patterns:
170+
- pattern: func $NAME( ... ) { ... }
171+
- metavariable-pattern:
172+
metavariable: $NAME
173+
patterns:
174+
- pattern-regex: "(?i)ResourceExplorer2"
175+
- pattern-not-regex: ^TestAcc.*
176+
severity: WARNING
177+
- id: resourceexplorer2-in-test-name
178+
languages:
179+
- go
180+
message: Include "ResourceExplorer2" in test name
181+
paths:
182+
include:
183+
- internal/service/resourceexplorer2/*_test.go
184+
patterns:
185+
- pattern: func $NAME( ... ) { ... }
186+
- metavariable-pattern:
187+
metavariable: $NAME
188+
patterns:
189+
- pattern-not-regex: "^TestAccResourceExplorer2"
190+
- pattern-regex: ^TestAcc.*
191+
severity: WARNING
192+
- id: resourceexplorer2-in-const-name
193+
languages:
194+
- go
195+
message: Do not use "ResourceExplorer2" in const name inside resourceexplorer2 package
196+
paths:
197+
include:
198+
- internal/service/resourceexplorer2
199+
patterns:
200+
- pattern: const $NAME = ...
201+
- metavariable-pattern:
202+
metavariable: $NAME
203+
patterns:
204+
- pattern-regex: "(?i)ResourceExplorer2"
205+
severity: WARNING
206+
- id: resourceexplorer2-in-var-name
207+
languages:
208+
- go
209+
message: Do not use "ResourceExplorer2" in var name inside resourceexplorer2 package
210+
paths:
211+
include:
212+
- internal/service/resourceexplorer2
213+
patterns:
214+
- pattern: var $NAME = ...
215+
- metavariable-pattern:
216+
metavariable: $NAME
217+
patterns:
218+
- pattern-regex: "(?i)ResourceExplorer2"
219+
severity: WARNING
205220
- id: resourcegroups-in-func-name
206221
languages:
207222
- go

‎.github/labeler-issue-triage.yml

+2
Original file line numberDiff line numberDiff line change
@@ -503,6 +503,8 @@ service/rekognition:
503503
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_rekognition_'
504504
service/resiliencehub:
505505
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_resiliencehub_'
506+
service/resourceexplorer2:
507+
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_resourceexplorer2_'
506508
service/resourcegroups:
507509
- '((\*|-)\s*`?|(data|resource)\s+"?)aws_resourcegroups_'
508510
service/resourcegroupstaggingapi:

‎.github/labeler-pr-triage.yml

+3
Original file line numberDiff line numberDiff line change
@@ -818,6 +818,9 @@ service/rekognition:
818818
service/resiliencehub:
819819
- 'internal/service/resiliencehub/**/*'
820820
- 'website/**/resiliencehub_*'
821+
service/resourceexplorer2:
822+
- 'internal/service/resourceexplorer2/**/*'
823+
- 'website/**/resourceexplorer2_*'
821824
service/resourcegroups:
822825
- 'internal/service/resourcegroups/**/*'
823826
- 'website/**/resourcegroups_*'

‎.teamcity/components/generated/services_all.kt

+1
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ val services = mapOf(
138138
"redshift" to ServiceSpec("Redshift", vpcLock = true),
139139
"redshiftdata" to ServiceSpec("Redshift Data"),
140140
"redshiftserverless" to ServiceSpec("Redshift Serverless"),
141+
"resourceexplorer2" to ServiceSpec("Resource Explorer"),
141142
"resourcegroups" to ServiceSpec("Resource Groups"),
142143
"resourcegroupstaggingapi" to ServiceSpec("Resource Groups Tagging"),
143144
"rolesanywhere" to ServiceSpec("Roles Anywhere"),

‎go.mod

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
github.com/aws/aws-sdk-go-v2/service/kendra v1.36.0
1919
github.com/aws/aws-sdk-go-v2/service/medialive v1.24.2
2020
github.com/aws/aws-sdk-go-v2/service/rds v1.31.0
21+
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.0.2
2122
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.12
2223
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.19
2324
github.com/aws/aws-sdk-go-v2/service/s3control v1.28.0

‎go.sum

+2
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ github.com/aws/aws-sdk-go-v2/service/medialive v1.24.2 h1:qQGI444VIllp+BlfPUAEO7
7676
github.com/aws/aws-sdk-go-v2/service/medialive v1.24.2/go.mod h1:ToDxovZoXnH2AbxzTQ26ySXjpmME5gGa7aiH2rnAVv8=
7777
github.com/aws/aws-sdk-go-v2/service/rds v1.31.0 h1:lx8pflhN7oogISvAorwqPGFHN7eiVlGEwk21ThYcyoA=
7878
github.com/aws/aws-sdk-go-v2/service/rds v1.31.0/go.mod h1:wPFe1Cj3nZWmNWKKdkXw961l1dJheTZQ5JjPImqbMuI=
79+
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.0.2 h1:IirJpFu/wVrDitXuapCp+JqU+tSen1WwtJMvtrVzzyI=
80+
github.com/aws/aws-sdk-go-v2/service/resourceexplorer2 v1.0.2/go.mod h1:24lb9a+B8Ckl81TXecnjnKmgAMOW0Dgn7yLTNDejOgw=
7981
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.12 h1:lP9dP8V4ow1YKEZt/zcPfHu2/lAWGmW1pIzgt2iPGRY=
8082
github.com/aws/aws-sdk-go-v2/service/rolesanywhere v1.0.12/go.mod h1:pj8fwktY8PHz60AlgCg/Mwb3nG7JDomW/4eeeud+66w=
8183
github.com/aws/aws-sdk-go-v2/service/route53domains v1.12.19 h1:UNe7/1LUyQ9udyVIdAg++HfuqnBgm3Or8f2nFCfSl0U=

‎infrastructure/repository/labels-service.tf

+1
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ variable "service_labels" {
239239
"redshiftserverless",
240240
"rekognition",
241241
"resiliencehub",
242+
"resourceexplorer2",
242243
"resourcegroups",
243244
"resourcegroupstaggingapi",
244245
"robomaker",

‎internal/conns/awsclient.go

-16
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@ package conns
22

33
import (
44
"fmt"
5-
6-
"github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs"
7-
"github.com/aws/aws-sdk-go-v2/service/rds"
8-
"github.com/aws/aws-sdk-go-v2/service/ssm"
95
)
106

117
// PartitionHostname returns a hostname with the provider domain suffix for the partition
@@ -21,15 +17,3 @@ func (client *AWSClient) PartitionHostname(prefix string) string {
2117
func (client *AWSClient) RegionalHostname(prefix string) string {
2218
return fmt.Sprintf("%s.%s.%s", prefix, client.Region, client.DNSSuffix)
2319
}
24-
25-
func (client *AWSClient) LogsClient() *cloudwatchlogs.Client {
26-
return client.logsClient.Client()
27-
}
28-
29-
func (client *AWSClient) RDSClient() *rds.Client {
30-
return client.rdsClient.Client()
31-
}
32-
33-
func (client *AWSClient) SSMClient() *ssm.Client {
34-
return client.ssmClient.Client()
35-
}

0 commit comments

Comments
 (0)