Merge pull request #316 from aws/smithy19

Smithy 1.9 Support
aws · Jul 13, 2021 · 36596d2 · 36596d2
2 parents 0cac23f + 40d50fb
commit 36596d2
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 17 deletions.
diff --git a/...smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/SmithyGoDependency.java b/...smithy-go-codegen/src/main/java/software/amazon/smithy/go/codegen/SmithyGoDependency.java
@@ -59,6 +59,7 @@ public final class SmithyGoDependency {
     public static final GoDependency GO_CMP_OPTIONS = goCmp("cmp/cmpopts");
 
     public static final GoDependency GO_JMESPATH = goJmespath(null);
+    public static final GoDependency MATH = stdlib("math");
 
     private static final String SMITHY_SOURCE_PATH = "github.com/aws/smithy-go";
     private static final String GO_CMP_SOURCE_PATH = "github.com/google/go-cmp";
@@ -69,6 +70,7 @@ private SmithyGoDependency() {
 
     /**
      * Get a {@link GoDependency} representing the standard library package import path.
+     *
      * @param importPath standard library import path
      * @return the {@link GoDependency} for the package import path
      */
@@ -78,8 +80,9 @@ public static GoDependency stdlib(String importPath) {
 
     /**
      * Get a {@link GoDependency} representing the standard library package import path with the given alias.
+     *
      * @param importPath standard library package import path
-     * @param alias the package alias
+     * @param alias      the package alias
      * @return the {@link GoDependency} for the package import path
      */
     public static GoDependency stdlib(String importPath, String alias) {

diff --git a/...ain/java/software/amazon/smithy/go/codegen/integration/HttpProtocolUnitTestGenerator.java b/...ain/java/software/amazon/smithy/go/codegen/integration/HttpProtocolUnitTestGenerator.java
@@ -86,12 +86,14 @@ protected HttpProtocolUnitTestGenerator(Builder<T> builder) {
         opSymbol = symbolProvider.toSymbol(operation);
 
         inputShape = model.expectShape(operation.getInput()
-                .orElseThrow(() -> new CodegenException("missing input shape for operation: " + operation.getId())),
+                        .orElseThrow(() -> new CodegenException("missing input shape for operation: "
+                                + operation.getId())),
                 StructureShape.class);
         inputSymbol = symbolProvider.toSymbol(inputShape);
 
         outputShape = model.expectShape(operation.getOutput()
-                .orElseThrow(() -> new CodegenException("missing output shape for operation: " + operation.getId())),
+                        .orElseThrow(() -> new CodegenException("missing output shape for operation: "
+                                + operation.getId())),
                 StructureShape.class);
         outputSymbol = symbolProvider.toSymbol(outputShape);
     }
@@ -440,17 +442,30 @@ protected void writeAssertComplexEqual(
             GoWriter writer, String expect, String actual, String[] ignoreTypes
     ) {
         writer.addUseImports(SmithyGoDependency.SMITHY_TESTING);
+        writer.addUseImports(SmithyGoDependency.GO_CMP);
         writer.addUseImports(SmithyGoDependency.GO_CMP_OPTIONS);
+        writer.addUseImports(SmithyGoDependency.MATH);
+
+        writer.openBlock("opts := cmp.Options{", "}", () -> {
+            writer.openBlock("cmpopts.IgnoreUnexported(", "),", () -> {
+                for (String ignoreType : ignoreTypes) {
+                    writer.write("$L,", ignoreType);
+                }
+            });
+            writer.write("cmp.FilterValues(func(x, y float64) bool {\n"
+                    + "\treturn math.IsNaN(x) && math.IsNaN(y)\n"
+                    + "},"
+                    + "cmp.Comparer(func(_, _ interface{}) bool { return true })),");
+            writer.write("cmp.FilterValues(func(x, y float32) bool {\n"
+                    + "\treturn math.IsNaN(float64(x)) && math.IsNaN(float64(y))\n"
+                    + "},"
+                    + "cmp.Comparer(func(_, _ interface{}) bool { return true })),");
+        });
 
-        writer.writeInline("if err := smithytesting.CompareValues($L, $L, cmpopts.IgnoreUnexported(", expect, actual);
-
-        for (String ignoreType : ignoreTypes) {
-            writer.write("$L,", ignoreType);
-        }
-
-        writer.writeInline(")); err != nil {");
-        writer.write("   t.Errorf(\"expect $L value match:\\n%v\", err)", expect);
-        writer.write("}");
+        writer.openBlock("if err := smithytesting.CompareValues($L, $L, opts...); err != nil {", "}",
+                expect, actual, () -> {
+                    writer.write("t.Errorf(\"expect $L value match:\\n%v\", err)", expect);
+                });
     }
 
     /**

diff --git a/encoding/httpbinding/encode.go b/encoding/httpbinding/encode.go
@@ -8,7 +8,12 @@ import (
 	"strings"
 )
 
-const contentLengthHeader = "Content-Length"
+const (
+	contentLengthHeader = "Content-Length"
+	floatNaN            = "NaN"
+	floatInfinity       = "Infinity"
+	floatNegInfinity    = "-Infinity"
+)
 
 // An Encoder provides encoding of REST URI path, query, and header components
 // of an HTTP request. Can also encode a stream as the payload.
@@ -106,6 +111,6 @@ func (e *Encoder) AddQuery(key string) QueryValue {
 
 // HasQuery returns if a query with the key specified exists with one or
 // more value.
-func(e *Encoder) HasQuery(key string) bool {
+func (e *Encoder) HasQuery(key string) bool {
 	return len(e.query.Get(key)) != 0
 }
diff --git a/encoding/httpbinding/header.go b/encoding/httpbinding/header.go
@@ -2,6 +2,7 @@ package httpbinding
 
 import (
 	"encoding/base64"
+	"math"
 	"math/big"
 	"net/http"
 	"strconv"
@@ -88,7 +89,16 @@ func (h HeaderValue) Double(v float64) {
 }
 
 func (h HeaderValue) float(v float64, bitSize int) {
-	h.modifyHeader(strconv.FormatFloat(v, 'f', -1, bitSize))
+	switch {
+	case math.IsNaN(v):
+		h.String(floatNaN)
+	case math.IsInf(v, 1):
+		h.String(floatInfinity)
+	case math.IsInf(v, -1):
+		h.String(floatNegInfinity)
+	default:
+		h.modifyHeader(strconv.FormatFloat(v, 'f', -1, bitSize))
+	}
 }
 
 // BigInteger encodes the value v as a query string value

diff --git a/encoding/httpbinding/query.go b/encoding/httpbinding/query.go
@@ -2,6 +2,7 @@ package httpbinding
 
 import (
 	"encoding/base64"
+	"math"
 	"math/big"
 	"net/url"
 	"strconv"
@@ -79,7 +80,16 @@ func (qv QueryValue) Double(v float64) {
 }
 
 func (qv QueryValue) float(v float64, bitSize int) {
-	qv.updateKey(strconv.FormatFloat(v, 'f', -1, bitSize))
+	switch {
+	case math.IsNaN(v):
+		qv.String(floatNaN)
+	case math.IsInf(v, 1):
+		qv.String(floatInfinity)
+	case math.IsInf(v, -1):
+		qv.String(floatNegInfinity)
+	default:
+		qv.updateKey(strconv.FormatFloat(v, 'f', -1, bitSize))
+	}
 }
 
 // BigInteger encodes v as a query string value

diff --git a/encoding/httpbinding/uri.go b/encoding/httpbinding/uri.go
@@ -1,6 +1,7 @@
 package httpbinding
 
 import (
+	"math"
 	"math/big"
 	"strconv"
 	"strings"
@@ -64,7 +65,16 @@ func (u URIValue) Double(v float64) error {
 }
 
 func (u URIValue) float(v float64, bitSize int) error {
-	return u.modifyURI(strconv.FormatFloat(v, 'f', -1, bitSize))
+	switch {
+	case math.IsNaN(v):
+		return u.String(floatNaN)
+	case math.IsInf(v, 1):
+		return u.String(floatInfinity)
+	case math.IsInf(v, -1):
+		return u.String(floatNegInfinity)
+	default:
+		return u.modifyURI(strconv.FormatFloat(v, 'f', -1, bitSize))
+	}
 }
 
 // BigInteger encodes v as a query string value