Merge pull request #851 from aws/r53cust-fix

route53: codegen fix to correctly look for operations that need sanitize url
aws · Oct 23, 2020 · cb36c8d · cb36c8d
2 parents 4e3fc08 + cc57f65
commit cb36c8d
Show file tree

Hide file tree

Showing 15 changed files with 24 additions and 4 deletions.
diff --git a/.../main/java/software/amazon/smithy/aws/go/codegen/customization/Route53Customizations.java b/.../main/java/software/amazon/smithy/aws/go/codegen/customization/Route53Customizations.java
@@ -3,7 +3,9 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import software.amazon.smithy.aws.traits.ServiceTrait;
+import software.amazon.smithy.codegen.core.CodegenException;
 import software.amazon.smithy.codegen.core.SymbolProvider;
 import software.amazon.smithy.go.codegen.GoDelegator;
 import software.amazon.smithy.go.codegen.GoSettings;
@@ -143,12 +145,17 @@ private static boolean supportsHostedZoneIDValue(Model model, ServiceShape servi
         }
 
         StructureShape input = model.expectShape(operation.getInput().get(), StructureShape.class);
-        Optional<MemberShape> targetMember = input.getAllMembers().values().stream().findFirst().filter(
+        List<MemberShape> targetMembers = input.getAllMembers().values().stream().filter(
                 memberShape -> memberShape.getTarget().getName().equalsIgnoreCase("ResourceId") ||
                         memberShape.getTarget().getName().equalsIgnoreCase("DelegationSetId")
-        );
+        ).collect(Collectors.toList());
+
+        if (targetMembers.size() >1 ){
+            throw new CodegenException(String.format("Route53 service has ResourceId, DelegationSetId members " +
+                            "modeled on %s shape", input.getId().getName()));
+        }
 
-        return targetMember.isPresent();
+        return targetMembers.size() != 0;
     }
 
     // returns true if service is route53

diff --git a/service/route53/api_op_ChangeResourceRecordSets.go b/service/route53/api_op_ChangeResourceRecordSets.go
diff --git a/service/route53/api_op_CreateHostedZone.go b/service/route53/api_op_CreateHostedZone.go
diff --git a/service/route53/api_op_CreateQueryLoggingConfig.go b/service/route53/api_op_CreateQueryLoggingConfig.go
diff --git a/service/route53/api_op_CreateTrafficPolicyInstance.go b/service/route53/api_op_CreateTrafficPolicyInstance.go
diff --git a/service/route53/api_op_CreateVPCAssociationAuthorization.go b/service/route53/api_op_CreateVPCAssociationAuthorization.go
diff --git a/service/route53/api_op_DeleteVPCAssociationAuthorization.go b/service/route53/api_op_DeleteVPCAssociationAuthorization.go
diff --git a/service/route53/api_op_DisassociateVPCFromHostedZone.go b/service/route53/api_op_DisassociateVPCFromHostedZone.go
diff --git a/service/route53/api_op_ListHostedZonesByName.go b/service/route53/api_op_ListHostedZonesByName.go
diff --git a/service/route53/api_op_ListTrafficPolicyInstances.go b/service/route53/api_op_ListTrafficPolicyInstances.go
diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go b/service/route53/api_op_ListTrafficPolicyInstancesByHostedZone.go
diff --git a/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go b/service/route53/api_op_ListTrafficPolicyInstancesByPolicy.go
diff --git a/service/route53/api_op_ListVPCAssociationAuthorizations.go b/service/route53/api_op_ListVPCAssociationAuthorizations.go
diff --git a/service/route53/api_op_TestDNSAnswer.go b/service/route53/api_op_TestDNSAnswer.go
diff --git a/service/route53/go.mod b/service/route53/go.mod
@@ -3,7 +3,7 @@ module github.com/aws/aws-sdk-go-v2/service/route53
 go 1.15
 
 require (
-	github.com/aws/aws-sdk-go-v2 v0.27.1-0.20201021211102-ffda7ace423e
+	github.com/aws/aws-sdk-go-v2 v0.27.1-0.20201022222834-4451b4af620e
 	github.com/awslabs/smithy-go v0.2.0
 )