Merge pull request #35334 from hashicorp/td-endpoint-tests-simple-sdkv2

Adds endpoint tests for services implemented with AWS SDK v2, no aliases, and no custom envvars

.ci/.semgrep-caps-aws-ec2.yml

@@ -10,6 +10,7 @@ rules:
       exclude:
         - internal/service/securitylake/aws_log_source.go
         - internal/service/securitylake/aws_log_source_test.go
+        - internal/service/*/service_endpoints_gen_test.go
     patterns:
       - pattern: func $NAME( ... ) { ... }
       - metavariable-pattern:
@@ -27,6 +28,7 @@ rules:
         - internal
       exclude:
         - internal/service/securitylake/aws_log_source.go
+        - internal/service/*/service_endpoints_gen_test.go
     patterns:
       - pattern: const $NAME = ...
       - metavariable-pattern:
@@ -44,6 +46,7 @@ rules:
       exclude:
         - internal/service/securitylake/aws_log_source.go
         - internal/service/securitylake/exports_test.go
+        - internal/service/*/service_endpoints_gen_test.go
     patterns:
       - pattern: var $NAME = ...
       - metavariable-pattern:

.ci/semgrep/migrate/context.yml

@@ -28,6 +28,10 @@ rules:
       - pattern-not: conn.Handlers.$X(...)
       - pattern-not: conn.Handlers.$X.$Y(...)
       - pattern-not: conn.Options()
+      - pattern-not: codestarconnections_sdkv2.$API()
+      - pattern-not: connectcases_sdkv2.$API()
+      - pattern-not: mediaconnect_sdkv2.$API()
+      - pattern-not: pcaconnectorad_sdkv2.$API()
     severity: ERROR
   - id: context-todo
     languages: [go]

internal/generate/awsclient/main.go

@@ -57,17 +57,10 @@ func main() {
 			GoV2Package:       l.GoV2Package(),
 		}
 
-		if l.ClientSDKV1() != "" {
-			s.SDKVersion = "1"
+		s.SDKVersion = l.SDKVersion()
+		if l.ClientSDKV1() {
 			s.GoV1ClientTypeName = l.GoV1ClientTypeName()
 		}
-		if l.ClientSDKV2() != "" {
-			if l.ClientSDKV1() != "" {
-				s.SDKVersion = "1,2"
-			} else {
-				s.SDKVersion = "2"
-			}
-		}
 
 		td.Services = append(td.Services, s)
 	}

internal/generate/checknames/main.go

@@ -21,7 +21,7 @@ import (
 )
 
 const (
-	lineOffset = 1 // translate from 0-based to 1-based index
+	lineOffset = 2 // 1 for skipping header line + 1 to translate from 0-based to 1-based index
 )
 
 // DocPrefix tests/column needs to be reworked for compatibility with tfproviderdocs
@@ -98,15 +98,15 @@ func main() {
 			}
 		}
 
-		if l.ClientSDKV1() == "" && l.ClientSDKV2() == "" && !l.Exclude() {
+		if !l.ClientSDKV1() && !l.ClientSDKV2() && !l.Exclude() {
 			log.Fatalf("in service data, line %d, for service %s, at least one of ClientSDKV1 or ClientSDKV2 must have a value if Exclude is blank", i+lineOffset, l.HumanFriendly())
 		}
 
-		if l.ClientSDKV1() != "" && (l.GoV1Package() == "" || l.GoV1ClientTypeName() == "") {
+		if l.ClientSDKV1() && (l.GoV1Package() == "" || l.GoV1ClientTypeName() == "") {
 			log.Fatalf("in service data, line %d, for service %s, SDKVersion is set to 1 so neither GoV1Package nor GoV1ClientTypeName can be blank", i+lineOffset, l.HumanFriendly())
 		}
 
-		if l.ClientSDKV2() != "" && l.GoV2Package() == "" {
+		if l.ClientSDKV2() && l.GoV2Package() == "" {
 			log.Fatalf("in service data, line %d, for service %s, SDKVersion is set to 2 so GoV2Package cannot be blank", i+lineOffset, l.HumanFriendly())
 		}
 
@@ -177,6 +177,12 @@ func main() {
 			log.Printf("in service data, line %d, for service %s, SdkId is required unless Exclude is set", i+lineOffset, l.HumanFriendly())
 		}
 
+		if l.EndpointAPICall() == "" {
+			if l.ClientSDKV2() && len(l.Aliases()) == 0 && l.DeprecatedEnvVar() == "" && l.TfAwsEnvVar() == "" {
+				log.Printf("in service data, line %d, for service %s, EndpointAPICall is required for SDKv2 services without aliases or custom envvars", i+lineOffset, l.HumanFriendly())
+			}
+		}
+
 		rre := l.ResourcePrefixActual()
 
 		if rre == "" {
@@ -191,7 +197,7 @@ func main() {
 
 		allChecks++
 	}
-	fmt.Printf("  Performed %d checks on service data, 0 errors.\n", (allChecks * 39))
+	fmt.Printf("  Performed %d checks on service data, 0 errors.\n", (allChecks * 40))
 
 	var fileErrs bool
 

internal/generate/serviceendpointtests/README.md

@@ -0,0 +1,3 @@
+# serviceendpointtests
+
+The `serviceendpointtests` generator creates tests for endpoint configuration precedence.