Fix tests from updating smithy version

smithy-lang · Oct 18, 2024 · b1144ad · b1144ad
1 parent 050b1fb
commit b1144ad
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 36 deletions.
diff --git a/codegen/projections/rails_json/lib/rails_json/builders.rb b/codegen/projections/rails_json/lib/rails_json/builders.rb
diff --git a/codegen/projections/rails_json/spec/protocol_spec.rb b/codegen/projections/rails_json/spec/protocol_spec.rb
diff --git a/...rc/main/java/software/amazon/smithy/ruby/codegen/generators/RestBuilderGeneratorBase.java b/...rc/main/java/software/amazon/smithy/ruby/codegen/generators/RestBuilderGeneratorBase.java
@@ -414,10 +414,10 @@ public Void floatShape(FloatShape shape) {
         public Void stringShape(StringShape shape) {
             // string values with a mediaType trait are always base64 encoded.
             if (shape.hasTrait(MediaTypeTrait.class)) {
-                writer.write("$1L$3T::strict_encode64($2L).strip unless $2L.nil? || $2L.empty?",
+                writer.write("$1L$3T::strict_encode64($2L).strip unless $2L.nil?",
                         dataSetter, inputGetter, RubyImportContainer.BASE64);
             } else {
-                writer.write("$1L$2L unless $2L.nil? || $2L.empty?", dataSetter, inputGetter);
+                writer.write("$1L$2L unless $2L.nil?", dataSetter, inputGetter);
             }
             return null;
         }
@@ -434,7 +434,7 @@ public Void timestampShape(TimestampShape shape) {
 
         @Override
         public Void listShape(ListShape shape) {
-            writer.openBlock("unless $1L.nil? || $1L.empty?", inputGetter)
+            writer.openBlock("unless $1L.nil?", inputGetter)
                     .call(() -> model.expectShape(shape.getMember().getTarget())
                             .accept(new HeaderListMemberSerializer(inputGetter, dataSetter, shape.getMember())))
                     .closeBlock("end");

diff --git a/codegen/smithy-ruby-rails-codegen-test/model/http-headers.smithy b/codegen/smithy-ruby-rails-codegen-test/model/http-headers.smithy
@@ -428,7 +428,11 @@ apply NullAndEmptyHeadersClient @httpRequestTests([
         protocol: railsJson,
         method: "GET",
         uri: "/NullAndEmptyHeadersClient",
-        forbidHeaders: ["X-A", "X-B", "X-C"],
+        forbidHeaders: ["X-A"],
+        headers: {
+            "X-B": ""
+            "X-C": ""
+        }
         body: "",
         params: {
             a: null,

diff --git a/codegen/smithy-ruby-rails-codegen-test/model/http-prefix-headers.smithy b/codegen/smithy-ruby-rails-codegen-test/model/http-prefix-headers.smithy
@@ -42,7 +42,7 @@ apply HttpPrefixHeaders @httpRequestTests([
     },
     {
         id: "RailsJsonHttpPrefixHeadersAreNotPresent",
-        documentation: "No prefix headers are serialized because the value is empty",
+        documentation: "No prefix headers are serialized because the value is not present",
         protocol: railsJson,
         method: "GET",
         uri: "/HttpPrefixHeaders",
@@ -56,6 +56,23 @@ apply HttpPrefixHeaders @httpRequestTests([
         },
         appliesTo: "client"
     },
+    {
+        id: "RailsJsonHttpPrefixEmptyHeaders",
+        documentation: "Serialize prefix headers were the value is present but empty"
+        protocol: railsJson,
+        method: "GET",
+        uri: "/HttpPrefixHeaders",
+        body: "",
+        params: {
+            fooMap: {
+                Abc: ""
+            }
+        },
+        headers: {
+            "X-Foo-Abc": ""
+        }
+        appliesTo: "client",
+    }
 ])
 
 apply HttpPrefixHeaders @httpResponseTests([