Merge pull request aws#992 from aws/xmlDecoderFixes

XML deserialization fixes and smithy-go dependency changes

.travis.yml

@@ -40,7 +40,7 @@ matrix:
         - JAVA_TOOL_OPTIONS="-Xmx1g"
       before_script:
           - rm -rf /tmp/smithy-go
-          - git clone https://github.com/awslabs/smithy-go /tmp/smithy-go
+          - git clone https://github.com/aws/smithy-go /tmp/smithy-go
           - pushd /tmp/smithy-go/codegen
           - ./gradlew clean publishToMavenLocal -Plog-tests
           - popd
@@ -53,7 +53,7 @@ matrix:
         - JAVA_TOOL_OPTIONS="-Xmx1g"
       before_script:
           - rm -rf /tmp/smithy-go
-          - git clone https://github.com/awslabs/smithy-go /tmp/smithy-go
+          - git clone https://github.com/aws/smithy-go /tmp/smithy-go
           - pushd /tmp/smithy-go/codegen
           - ./gradlew clean publishToMavenLocal -Plog-tests
           - popd

Makefile

@@ -71,11 +71,11 @@ gen-repo-mod-replace:
 
 gen-mod-replace-smithy:
 	cd ./internal/repotools/cmd/eachmodule \
-    		&& go run . "go mod edit -replace github.com/awslabs/smithy-go=${SMITHY_GO_SRC}"
+    		&& go run . "go mod edit -replace github.com/aws/smithy-go=${SMITHY_GO_SRC}"
 
 gen-mod-dropreplace-smithy:
 	cd ./internal/repotools/cmd/eachmodule \
-    		&& go run . "go mod edit -dropreplace github.com/awslabs/smithy-go"
+    		&& go run . "go mod edit -dropreplace github.com/aws/smithy-go"
 
 gen-aws-ptrs:
 	cd aws && go generate

aws/config.go

@@ -3,8 +3,8 @@ package aws
 import (
 	"net/http"
 
-	"github.com/awslabs/smithy-go/logging"
-	"github.com/awslabs/smithy-go/middleware"
+	"github.com/aws/smithy-go/logging"
+	"github.com/aws/smithy-go/middleware"
 )
 
 // HTTPClient provides the interface to provide custom HTTPClients. Generally

aws/generate.go

@@ -8,7 +8,7 @@ import (
 	"os"
 	"text/template"
 
-	"github.com/awslabs/smithy-go/ptr"
+	"github.com/aws/smithy-go/ptr"
 )
 
 func main() {
@@ -44,7 +44,7 @@ var ptrTmpl = template.Must(template.New("ptrTmpl").Parse(`
 	package aws
 
 	import (
-		"github.com/awslabs/smithy-go/ptr"
+		"github.com/aws/smithy-go/ptr"
 		{{- range $_, $import := $.Imports }}
 			"{{ $import.Path }}"
 		{{- end }}

aws/middleware/metadata.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"github.com/awslabs/smithy-go/middleware"
+	"github.com/aws/smithy-go/middleware"
 )
 
 // RegisterServiceMetadata registers metadata about the service and operation into the middleware context

aws/middleware/metadata_test.go

@@ -5,7 +5,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/awslabs/smithy-go/middleware"
+	"github.com/aws/smithy-go/middleware"
 )
 
 func TestServiceMetadataProvider(t *testing.T) {

aws/middleware/middleware.go

@@ -8,9 +8,9 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/internal/rand"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyrand "github.com/awslabs/smithy-go/rand"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyrand "github.com/aws/smithy-go/rand"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // ClientRequestID is a Smithy BuildMiddleware that will generate a unique ID for logical API operation

aws/middleware/middleware_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/rand"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	smithymiddleware "github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	smithymiddleware "github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 func TestClientRequestID(t *testing.T) {

aws/middleware/request_id.go

@@ -1,7 +1,7 @@
 package middleware
 
 import (
-	"github.com/awslabs/smithy-go/middleware"
+	"github.com/aws/smithy-go/middleware"
 )
 
 // requestIDKey is used to retrieve request id from response metadata

aws/middleware/request_id_retriever.go

@@ -3,8 +3,8 @@ package middleware
 import (
 	"context"
 
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // AddRequestIDRetrieverMiddleware adds request id retriever middleware

aws/middleware/user_agent.go

@@ -7,8 +7,8 @@ import (
 	"runtime"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 const execEnvVar = `AWS_EXECUTION_ENV`

aws/middleware/user_agent_test.go

@@ -9,8 +9,8 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 )

aws/protocol/query/encoder_test.go

@@ -3,7 +3,7 @@ package query
 import (
 	"bytes"
 	"fmt"
-	smithytesting "github.com/awslabs/smithy-go/testing"
+	smithytesting "github.com/aws/smithy-go/testing"
 	"testing"
 )
 

aws/protocol/query/middleware.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // AddAsGetRequestMiddleware adds a middleware to the Serialize stack after the

aws/protocol/query/middleware_test.go

@@ -5,8 +5,8 @@ import (
 	"context"
 	"testing"
 
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 func TestAsGetRequestMiddleware(t *testing.T) {

aws/protocol/query/value.go

@@ -4,7 +4,7 @@ import (
 	"math/big"
 	"net/url"
 
-	"github.com/awslabs/smithy-go/encoding/httpbinding"
+	"github.com/aws/smithy-go/encoding/httpbinding"
 )
 
 // Value represents a Query Value type.

aws/protocol/restjson/decoder_util.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"strings"
 
-	"github.com/awslabs/smithy-go"
+	"github.com/aws/smithy-go"
 )
 
 // GetErrorInfo util looks for code, __type, and message members in the

aws/retry/middleware.go

@@ -10,9 +10,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsmiddle "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	"github.com/awslabs/smithy-go/logging"
-	smithymiddle "github.com/awslabs/smithy-go/middleware"
-	"github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/logging"
+	smithymiddle "github.com/aws/smithy-go/middleware"
+	"github.com/aws/smithy-go/transport/http"
 )
 
 // RequestCloner is a function that can take an input request type and clone the request

aws/retry/middleware_test.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"github.com/google/go-cmp/cmp"
 )
 

aws/signer/v4/middleware.go

@@ -11,8 +11,8 @@ import (
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	v4Internal "github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyHTTP "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyHTTP "github.com/aws/smithy-go/transport/http"
 )
 
 const computePayloadHashMiddlewareID = "ComputePayloadHash"

aws/signer/v4/middleware_test.go

@@ -15,9 +15,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
-	"github.com/awslabs/smithy-go/logging"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/logging"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 func TestComputePayloadHashMiddleware(t *testing.T) {

aws/signer/v4/presign_middleware.go

@@ -9,8 +9,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/sdk"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyHTTP "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyHTTP "github.com/aws/smithy-go/transport/http"
 )
 
 // HTTPPresigner is an interface to a SigV4 signer that can sign create a

aws/signer/v4/presign_middleware_test.go

@@ -12,9 +12,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/aws"
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
 	"github.com/aws/aws-sdk-go-v2/internal/awstesting/unit"
-	"github.com/awslabs/smithy-go/logging"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/logging"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 	"github.com/google/go-cmp/cmp"
 )
 

aws/signer/v4/v4.go

@@ -58,8 +58,8 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	v4Internal "github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4"
-	"github.com/awslabs/smithy-go/encoding/httpbinding"
-	"github.com/awslabs/smithy-go/logging"
+	"github.com/aws/smithy-go/encoding/httpbinding"
+	"github.com/aws/smithy-go/logging"
 )
 
 const (

aws/transport/http/content_type.go

@@ -3,8 +3,8 @@ package http
 import (
 	"context"
 	"fmt"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // removeContentTypeHeader is a build middleware that removes

aws/transport/http/response_error.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // ResponseError provides the HTTP centric error type wrapping the underlying error

aws/transport/http/response_error_middleware.go

@@ -4,8 +4,8 @@ import (
 	"context"
 
 	awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 // AddResponseErrorMiddleware adds response error wrapper middleware

aws/transport/http/timeout_read_closer.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"time"
 
-	"github.com/awslabs/smithy-go"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
+	"github.com/aws/smithy-go"
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 type readResult struct {

aws/transport/http/timeout_read_closer_test.go

@@ -3,12 +3,13 @@ package http
 import (
 	"context"
 	"errors"
-	"github.com/awslabs/smithy-go/middleware"
-	smithyhttp "github.com/awslabs/smithy-go/transport/http"
 	"io"
 	"net/http"
 	"testing"
 	"time"
+
+	"github.com/aws/smithy-go/middleware"
+	smithyhttp "github.com/aws/smithy-go/transport/http"
 )
 
 type testReader struct {

codegen/smithy-aws-go-codegen/src/main/java/software/amazon/smithy/aws/go/codegen/AwsHttpPresignURLClientGenerator.java

@@ -89,7 +89,7 @@ public class AwsHttpPresignURLClientGenerator implements GoIntegration {
 
     // map of service to list of operations for which presignedURL client and operation should
     // be generated.
-    public static Map<ShapeId, Set<ShapeId>> PRESIGNER_MAP = new TreeMap<>();
+    private final Map<ShapeId, Set<ShapeId>> PRESIGNER_MAP = new TreeMap<>();
 
     private static final String addAsUnsignedPayloadName(String operationName) {
         return String.format("add%sPayloadAsUnsigned", operationName);