Merge pull request #2243 from aws/feat-protocol-test-2

feat: protocoltest: enable endpoint tests
aws · Aug 18, 2023 · 5d3382b · 5d3382b
2 parents f58ddae + 37347b1
commit 5d3382b
Show file tree

Hide file tree

Showing 145 changed files with 1,443 additions and 3,622 deletions.
diff --git a/Makefile b/Makefile
@@ -86,7 +86,10 @@ tidy-modules-. add-module-license-files gen-aws-ptrs format
 
 generate-tmpreplace-smithy: smithy-generate update-requires gen-repo-mod-replace update-module-metadata smithy-annotate-stable \
 gen-config-asserts gen-internal-codegen copy-attributevalue-feature gen-mod-replace-smithy-. min-go-version-. \
-tidy-modules-. add-module-license-files gen-aws-ptrs format gen-mod-dropreplace-smithy-.
+tidy-modules-. add-module-license-files gen-aws-ptrs format gen-mod-dropreplace-smithy-. reset-sum
+
+reset-sum:
+	find . -name go.sum -exec git checkout -- {} \;
 
 smithy-generate:
 	cd codegen && ./gradlew clean build -Plog-tests && ./gradlew clean

diff --git a/ci-find-smithy-go.sh b/ci-find-smithy-go.sh
@@ -24,12 +24,19 @@ if [ "$branch" == main ]; then
     exit 0
 fi
 
+# For PR workflows, only the triggering ref is checked out, which in isolation
+# is not recognized as a branch by git. Use the specific workflow env instead.
+if [ -z "$branch" ]; then
+    branch=$GITHUB_HEAD_REF
+fi
+
 if [ -n "$GIT_PAT" ]; then
     repository=https://$GIT_PAT@github.com/$SMITHY_GO_REPOSITORY
 else
     repository=https://github.com/$SMITHY_GO_REPOSITORY
 fi
 
+echo on branch \"$branch\"
 while [ -n "$branch" ] && [[ "$branch" == *-* ]]; do
     echo looking for $branch...
     git ls-remote --exit-code --heads $repository refs/heads/$branch

diff --git a/...y-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java b/...y-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsGoDependency.java
@@ -57,7 +57,7 @@ public class AwsGoDependency {
             null, Versions.INTERNAL_SIGV4A, "v4a");
     public static final GoDependency S3_INTERNAL_ARN = aws("service/internal/s3shared/arn", "s3arn");
     public static final GoDependency AWS_ARN = aws("aws/arn", "awsarn");
-
+    public static final GoDependency AWS_PROTOCOL_TEST_HTTP_CLIENT = aws("internal/protocoltest", "protocoltesthttp");
 
     public static final GoDependency REGEXP = SmithyGoDependency.stdlib("regexp");
 

diff --git a/...-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java b/...-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsProtocolUtils.java
@@ -17,6 +17,8 @@
 
 import java.util.Set;
 import java.util.TreeSet;
+
+import software.amazon.smithy.aws.go.codegen.customization.AwsCustomGoDependency;
 import software.amazon.smithy.codegen.core.Symbol;
 import software.amazon.smithy.go.codegen.GoWriter;
 import software.amazon.smithy.go.codegen.SmithyGoDependency;
@@ -98,96 +100,12 @@ static void generateHttpProtocolTests(GenerationContext context) {
         inputConfigValues.add(HttpProtocolUnitTestGenerator.ConfigValue.builder()
                 .name(AddAwsConfigFields.HTTP_CLIENT_CONFIG_NAME)
                 .value(writer -> {
-                    writer.addUseImports(AwsGoDependency.AWS_HTTP_TRANSPORT);
-                    writer.write("awshttp.NewBuildableClient(),");
+                    writer.addUseImports(AwsGoDependency.AWS_PROTOCOL_TEST_HTTP_CLIENT);
+                    writer.write("protocoltesthttp.NewClient(),");
                 })
                 .build());
 
-        Set<HttpProtocolUnitTestGenerator.SkipTest> inputSkipTests = new TreeSet<>(SetUtils.of(
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.restjson#RestJson"))
-                        .operation(ShapeId.from("aws.protocoltests.restjson#EndpointOperation"))
-                        .addTestName("RestJsonEndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.restjson#RestJson"))
-                        .operation(ShapeId.from("aws.protocoltests.restjson#EndpointWithHostLabelOperation"))
-                        .addTestName("RestJsonEndpointTraitWithHostLabel")
-                        .build(),
-
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.ec2#AwsEc2"))
-                        .operation(ShapeId.from("aws.protocoltests.ec2#EndpointOperation"))
-                        .addTestName("Ec2QueryEndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.ec2#AwsEc2"))
-                        .operation(ShapeId.from("aws.protocoltests.ec2#EndpointWithHostLabelOperation"))
-                        .addTestName("Ec2QueryEndpointTraitWithHostLabel")
-                        .build(),
-
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.json#JsonProtocol"))
-                        .operation(ShapeId.from("aws.protocoltests.json#EndpointOperation"))
-                        .addTestName("AwsJson11EndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.json#JsonProtocol"))
-                        .operation(ShapeId.from("aws.protocoltests.json#EndpointWithHostLabelOperation"))
-                        .addTestName("AwsJson11EndpointTraitWithHostLabel")
-                        .build(),
-
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.json10#JsonRpc10"))
-                        .operation(ShapeId.from("aws.protocoltests.json10#EndpointOperation"))
-                        .addTestName("AwsJson10EndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.json10#JsonRpc10"))
-                        .operation(ShapeId.from("aws.protocoltests.json10#EndpointWithHostLabelOperation"))
-                        .addTestName("AwsJson10EndpointTraitWithHostLabel")
-                        .build(),
-
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.query#AwsQuery"))
-                        .operation(ShapeId.from("aws.protocoltests.query#EndpointOperation"))
-                        .addTestName("AwsQueryEndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.query#AwsQuery"))
-                        .operation(ShapeId.from("aws.protocoltests.query#EndpointWithHostLabelOperation"))
-                        .addTestName("AwsQueryEndpointTraitWithHostLabel")
-                        .build(),
-
-                // Endpoint prefix serialization doesn't work with test runner's handling of request URLs.
-                // e.g. http://foo.127.0.0.1:59850/ dial fail
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.restxml#RestXml"))
-                        .operation(ShapeId.from("aws.protocoltests.restxml#EndpointOperation"))
-                        .addTestName("RestXmlEndpointTrait")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.restxml#RestXml"))
-                        .operation(ShapeId.from("aws.protocoltests.restxml#EndpointWithHostLabelHeaderOperation"))
-                        .addTestName("RestXmlEndpointTraitWithHostLabelAndHttpBinding")
-                        .build(),
-                HttpProtocolUnitTestGenerator.SkipTest.builder()
-                        .service(ShapeId.from("aws.protocoltests.restxml#RestXml"))
-                        .operation(ShapeId.from("aws.protocoltests.restxml#EndpointWithHostLabelOperation"))
-                        .addTestName("RestXmlEndpointTraitWithHostLabel")
-                        .build()
-
-        ));
+        Set<HttpProtocolUnitTestGenerator.SkipTest> inputSkipTests = new TreeSet<>(SetUtils.of());
 
         Set<HttpProtocolUnitTestGenerator.SkipTest> outputSkipTests = new TreeSet<>(SetUtils.of(
                 // REST-JSON optional (SHOULD) test cases

diff --git a/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes_test.go b/internal/protocoltest/awsrestjson/api_op_AllQueryStringTypes_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString_test.go b/internal/protocoltest/awsrestjson/api_op_ConstantAndVariableQueryString_test.go
diff --git a/internal/protocoltest/awsrestjson/api_op_ConstantQueryString_test.go b/internal/protocoltest/awsrestjson/api_op_ConstantQueryString_test.go