Merge pull request #27310 from sasidhar-aws/computeoptimizer_servicec…

…lient add computeoptimizer service
hashicorp · Oct 18, 2022 · ade4b69 · ade4b69
2 parents 8442b5b + 22e8149
commit ade4b69
Show file tree

Hide file tree

Showing 13 changed files with 159 additions and 82 deletions.
diff --git a/.ci/.semgrep-service-name0.yml b/.ci/.semgrep-service-name0.yml
@@ -2997,92 +2997,105 @@ rules:
           patterns:
             - pattern-regex: "(?i)Comprehend"
     severity: WARNING
-  - id: configservice-in-func-name
+  - id: computeoptimizer-in-func-name
     languages:
       - go
-    message: Do not use "ConfigService" in func name inside configservice package
+    message: Do not use "ComputeOptimizer" in func name inside computeoptimizer package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/computeoptimizer
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)ComputeOptimizer"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: configservice-in-test-name
+  - id: computeoptimizer-in-test-name
     languages:
       - go
-    message: Include "ConfigService" in test name
+    message: Include "ComputeOptimizer" in test name
     paths:
       include:
-        - internal/service/configservice/*_test.go
+        - internal/service/computeoptimizer/*_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-not-regex: "^TestAccConfigService"
+            - pattern-not-regex: "^TestAccComputeOptimizer"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-  - id: configservice-in-const-name
+  - id: computeoptimizer-in-const-name
     languages:
       - go
-    message: Do not use "ConfigService" in const name inside configservice package
+    message: Do not use "ComputeOptimizer" in const name inside computeoptimizer package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/computeoptimizer
     patterns:
       - pattern: const $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)ComputeOptimizer"
     severity: WARNING
-  - id: configservice-in-var-name
+  - id: computeoptimizer-in-var-name
     languages:
       - go
-    message: Do not use "ConfigService" in var name inside configservice package
+    message: Do not use "ComputeOptimizer" in var name inside computeoptimizer package
     paths:
       include:
-        - internal/service/configservice
+        - internal/service/computeoptimizer
     patterns:
       - pattern: var $NAME = ...
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)ConfigService"
+            - pattern-regex: "(?i)ComputeOptimizer"
     severity: WARNING
-  - id: connect-in-func-name
+  - id: configservice-in-func-name
     languages:
       - go
-    message: Do not use "Connect" in func name inside connect package
+    message: Do not use "ConfigService" in func name inside configservice package
     paths:
       include:
-        - internal/service/connect
+        - internal/service/configservice
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-regex: "(?i)Connect"
-            - pattern-not-regex: .*uickConnect.*
+            - pattern-regex: "(?i)ConfigService"
             - pattern-not-regex: ^TestAcc.*
     severity: WARNING
-  - id: connect-in-test-name
+  - id: configservice-in-test-name
     languages:
       - go
-    message: Include "Connect" in test name
+    message: Include "ConfigService" in test name
     paths:
       include:
-        - internal/service/connect/*_test.go
+        - internal/service/configservice/*_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
           metavariable: $NAME
           patterns:
-            - pattern-not-regex: "^TestAccConnect"
+            - pattern-not-regex: "^TestAccConfigService"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
+  - id: configservice-in-const-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in const name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING
diff --git a/.ci/.semgrep-service-name1.yml b/.ci/.semgrep-service-name1.yml
@@ -1,5 +1,50 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: configservice-in-var-name
+    languages:
+      - go
+    message: Do not use "ConfigService" in var name inside configservice package
+    paths:
+      include:
+        - internal/service/configservice
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ConfigService"
+    severity: WARNING
+  - id: connect-in-func-name
+    languages:
+      - go
+    message: Do not use "Connect" in func name inside connect package
+    paths:
+      include:
+        - internal/service/connect
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Connect"
+            - pattern-not-regex: .*uickConnect.*
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
+  - id: connect-in-test-name
+    languages:
+      - go
+    message: Include "Connect" in test name
+    paths:
+      include:
+        - internal/service/connect/*_test.go
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-not-regex: "^TestAccConnect"
+            - pattern-regex: ^TestAcc.*
+    severity: WARNING
   - id: connect-in-const-name
     languages:
       - go
@@ -3045,31 +3090,3 @@ rules:
             - pattern-not-regex: "^TestAccImageBuilder"
             - pattern-regex: ^TestAcc.*
     severity: WARNING
-  - id: imagebuilder-in-const-name
-    languages:
-      - go
-    message: Do not use "ImageBuilder" in const name inside imagebuilder package
-    paths:
-      include:
-        - internal/service/imagebuilder
-    patterns:
-      - pattern: const $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ImageBuilder"
-    severity: WARNING
-  - id: imagebuilder-in-var-name
-    languages:
-      - go
-    message: Do not use "ImageBuilder" in var name inside imagebuilder package
-    paths:
-      include:
-        - internal/service/imagebuilder
-    patterns:
-      - pattern: var $NAME = ...
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)ImageBuilder"
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name2.yml b/.ci/.semgrep-service-name2.yml
@@ -1,5 +1,33 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: imagebuilder-in-const-name
+    languages:
+      - go
+    message: Do not use "ImageBuilder" in const name inside imagebuilder package
+    paths:
+      include:
+        - internal/service/imagebuilder
+    patterns:
+      - pattern: const $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ImageBuilder"
+    severity: WARNING
+  - id: imagebuilder-in-var-name
+    languages:
+      - go
+    message: Do not use "ImageBuilder" in var name inside imagebuilder package
+    paths:
+      include:
+        - internal/service/imagebuilder
+    patterns:
+      - pattern: var $NAME = ...
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)ImageBuilder"
+    severity: WARNING
   - id: inspector-in-func-name
     languages:
       - go
@@ -3055,18 +3083,3 @@ rules:
           patterns:
             - pattern-regex: "(?i)RDS"
     severity: WARNING
-  - id: redshift-in-func-name
-    languages:
-      - go
-    message: Do not use "Redshift" in func name inside redshift package
-    paths:
-      include:
-        - internal/service/redshift
-    patterns:
-      - pattern: func $NAME( ... ) { ... }
-      - metavariable-pattern:
-          metavariable: $NAME
-          patterns:
-            - pattern-regex: "(?i)Redshift"
-            - pattern-not-regex: ^TestAcc.*
-    severity: WARNING
diff --git a/.ci/.semgrep-service-name3.yml b/.ci/.semgrep-service-name3.yml
@@ -1,5 +1,20 @@
 # Generated by internal/generate/servicesemgrep/main.go; DO NOT EDIT.
 rules:
+  - id: redshift-in-func-name
+    languages:
+      - go
+    message: Do not use "Redshift" in func name inside redshift package
+    paths:
+      include:
+        - internal/service/redshift
+    patterns:
+      - pattern: func $NAME( ... ) { ... }
+      - metavariable-pattern:
+          metavariable: $NAME
+          patterns:
+            - pattern-regex: "(?i)Redshift"
+            - pattern-not-regex: ^TestAcc.*
+    severity: WARNING
   - id: redshift-in-test-name
     languages:
       - go

diff --git a/.teamcity/components/generated/services_all.kt b/.teamcity/components/generated/services_all.kt
@@ -43,6 +43,7 @@ val services = mapOf(
     "cognitoidentity" to ServiceSpec("Cognito Identity"),
     "cognitoidp" to ServiceSpec("Cognito IDP (Identity Provider)"),
     "comprehend" to ServiceSpec("Comprehend", parallelismOverride = 10),
+    "computeoptimizer" to ServiceSpec("Compute Optimizer"),
     "configservice" to ServiceSpec("Config"),
     "connect" to ServiceSpec("Connect"),
     "controltower" to ServiceSpec("Control Tower"),

diff --git a/go.mod b/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/aws/aws-sdk-go-v2 v1.16.16
 	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17
 	github.com/aws/aws-sdk-go-v2/service/comprehend v1.19.0
+	github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.17.19
 	github.com/aws/aws-sdk-go-v2/service/fis v1.13.1
 	github.com/aws/aws-sdk-go-v2/service/identitystore v1.15.5
 	github.com/aws/aws-sdk-go-v2/service/inspector2 v1.8.1

diff --git a/go.sum b/go.sum
@@ -50,6 +50,8 @@ github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11 h1:6cZRymlLEIlDTEB0+5+An6Zj1CK
 github.com/aws/aws-sdk-go-v2/internal/ini v1.3.11/go.mod h1:0MR+sS1b/yxsfAPvAESrw8NfwUoxMinDyw6EYR9BS2U=
 github.com/aws/aws-sdk-go-v2/service/comprehend v1.19.0 h1:pBGwxTJF3e1kA0agTb34DbLXm+Ddth01yTcgaCsCAco=
 github.com/aws/aws-sdk-go-v2/service/comprehend v1.19.0/go.mod h1:7+jAM+u98ZbJwAxaXyvxlSJgWpGUGofDSHHIxcziIDQ=
+github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.17.19 h1:b9VD8wXsMRukE1FKm1na3fpeDdjxUWv1Rt09pB043oA=
+github.com/aws/aws-sdk-go-v2/service/computeoptimizer v1.17.19/go.mod h1:qo86DWOaN9axmzFjfXSAtQfBO99IKmzXAFD4XOq0J7A=
 github.com/aws/aws-sdk-go-v2/service/fis v1.13.1 h1:CNDkUBNTQRhBxDZRFQcXF8pK5WeJamwLWVNVY0PkeG0=
 github.com/aws/aws-sdk-go-v2/service/fis v1.13.1/go.mod h1:HElhDBQOUAofP6KBvJYTKC8Qhepi3RFMF6EWf+L6gws=
 github.com/aws/aws-sdk-go-v2/service/iam v1.18.4 h1:E41guA79mjEbwJdh0zXz1d8+Zt4zxRr+b1ipiVbKXzs=

diff --git a/internal/conns/awsclient_gen.go b/internal/conns/awsclient_gen.go
diff --git a/internal/conns/config.go b/internal/conns/config.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/feature/ec2/imds"
 	"github.com/aws/aws-sdk-go-v2/service/comprehend"
+	"github.com/aws/aws-sdk-go-v2/service/computeoptimizer"
 	"github.com/aws/aws-sdk-go-v2/service/fis"
 	"github.com/aws/aws-sdk-go-v2/service/identitystore"
 	"github.com/aws/aws-sdk-go-v2/service/inspector2"
@@ -206,6 +207,12 @@ func (c *Config) ConfigureProvider(ctx context.Context, client *AWSClient) (*AWS
 		}
 	})
 
+	client.ComputeOptimizerConn = computeoptimizer.NewFromConfig(cfg, func(o *computeoptimizer.Options) {
+		if endpoint := c.Endpoints[names.ComputeOptimizer]; endpoint != "" {
+			o.EndpointResolver = computeoptimizer.EndpointResolverFromURL(endpoint)
+		}
+	})
+
 	client.FISConn = fis.NewFromConfig(cfg, func(o *fis.Options) {
 		if endpoint := c.Endpoints[names.FIS]; endpoint != "" {
 			o.EndpointResolver = fis.EndpointResolverFromURL(endpoint)

diff --git a/internal/conns/config_gen.go b/internal/conns/config_gen.go
diff --git a/internal/service/computeoptimizer/README.md b/internal/service/computeoptimizer/README.md
@@ -0,0 +1,9 @@
+# Terraform AWS Provider ComputeOptimizer Package
+
+This area is primarily for AWS provider contributors and maintainers. For information on _using_ Terraform and the AWS provider, see the links below.
+
+## Handy Links
+
+* [Find out about contributing](https://hashicorp.github.io/terraform-provider-aws/#contribute) to the AWS provider!
+* AWS Provider Docs: [Home](https://registry.terraform.io/providers/hashicorp/aws/latest/docs)
+* AWS Docs: [AWS SDK for Go Config](https://docs.aws.amazon.com/sdk-for-go/api/service/computeoptimizer/)