Merge pull request #124 from djgoku/fix/extra-parens

Fix/extra parens

Author: onno-vos-dev

.github/workflows/gen_elixir.yml

@@ -15,8 +15,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        elixir: ["1.13.4"]
-        erlang: ["25.0.4"]
+        elixir: ["1.18.3"]
+        erlang: ["26"]
 
     steps:
       - uses: actions/checkout@v2
@@ -51,4 +51,4 @@ jobs:
         run: |
           mix deps.get
           mix test
-        working-directory: aws-beam/aws-elixir
+        working-directory: aws-beam/aws-elixir

.github/workflows/gen_erlang.yml

@@ -12,17 +12,17 @@ jobs:
     strategy:
       matrix:
         platform: [ubuntu-latest]
-        elixir: ["1.13.4"]
-        erlang: ["25.0.4"]
-        rebar3: ['3.20.0']
+        elixir: ["1.18.3"]
+        erlang: ["26"]
+        rebar3: ["3.25.0"]
     runs-on: ${{ matrix.platform }}
     services:
       ddb:
         image: amazon/dynamodb-local:1.21.0
         ports:
           - 8000:8000
       s3mock:
-        image: adobe/s3mock:2.11.0
+        image: adobe/s3mock:4.6.0
         ports:
           - 9090:9090
     steps:

lib/aws_codegen/types.ex

@@ -103,20 +103,24 @@ defmodule AWS.CodeGen.Types do
           %Shape{type: "structure"} ->
             type =
               "#{AWS.CodeGen.Name.to_snake_case(String.replace(shape_name, ~r/com\.amazonaws\.[^#]+#/, ""))}"
+              |> AWS.CodeGen.Util.maybe_add_parens()
 
             if reserved_type(type) do
-              "#{String.downcase(String.replace(context.module_name, ["aws_", "AWS."], ""))}_#{type}()"
+              "#{String.downcase(String.replace(context.module_name, ["aws_", "AWS."], ""))}_#{type}"
             else
-              "#{type}()"
+              "#{type}"
             end
 
           %Shape{type: "list", member: member} ->
-            type = "#{shape_to_type(context, member["target"], module_name, all_shapes)}"
+            # this change alone gets us down to 1595
+            type =
+              "#{shape_to_type(context, member["target"], module_name, all_shapes)}"
+              |> AWS.CodeGen.Util.maybe_add_parens()
 
             if reserved_type(type) do
-              "list(#{String.downcase(String.replace(context.module_name, ["aws_", "AWS."], ""))}_#{type}())"
+              "list(#{String.downcase(String.replace(context.module_name, ["aws_", "AWS."], ""))}_#{type})"
             else
-              "list(#{type}())"
+              "list(#{type})"
             end
 
           nil ->

lib/aws_codegen/util.ex

@@ -62,4 +62,12 @@ defmodule AWS.CodeGen.Util do
         |> Enum.reverse()
     end
   end
+
+  def maybe_add_parens(string) do
+    if String.ends_with?(string, "()") do
+      string
+    else
+      string <> "()"
+    end
+  end
 end

test/aws_codegen_test.exs

@@ -171,7 +171,7 @@ defmodule AWS.CodeGenTest do
 
                      put_audit_events_request() :: %{
                        optional(\"externalId\") => String.t(),
-                       required(\"auditEvents\") => list(audit_event()()),
+                       required(\"auditEvents\") => list(audit_event()),
                        required(\"channelArn\") => String.t()
                      }
 
@@ -183,8 +183,8 @@ defmodule AWS.CodeGenTest do
                  ## Example:
 
                      put_audit_events_response() :: %{
-                       required(\"failed\") => list(result_error_entry()()),
-                       required(\"successful\") => list(audit_event_result_entry()())
+                       required(\"failed\") => list(result_error_entry()),
+                       required(\"successful\") => list(audit_event_result_entry())
                      }
 
                  \"\"\"
@@ -409,7 +409,7 @@ defmodule AWS.CodeGenTest do
 
                      put_audit_events_request() :: %{
                        optional(\"externalId\") => String.t(),
-                       required(\"auditEvents\") => list(audit_event()()),
+                       required(\"auditEvents\") => list(audit_event()),
                        required(\"channelArn\") => String.t()
                      }
 
@@ -421,8 +421,8 @@ defmodule AWS.CodeGenTest do
                  ## Example:
 
                      put_audit_events_response() :: %{
-                       required(\"failed\") => list(result_error_entry()()),
-                       required(\"successful\") => list(audit_event_result_entry()())
+                       required(\"failed\") => list(result_error_entry()),
+                       required(\"successful\") => list(audit_event_result_entry())
                      }
 
                  \"\"\"
@@ -653,7 +653,7 @@ defmodule AWS.CodeGenTest do
 
                      put_audit_events_request() :: %{
                        optional(\"externalId\") => String.t(),
-                       required(\"auditEvents\") => list(audit_event()()),
+                       required(\"auditEvents\") => list(audit_event()),
                        required(\"channelArn\") => String.t()
                      }
 
@@ -665,8 +665,8 @@ defmodule AWS.CodeGenTest do
                  ## Example:
 
                      put_audit_events_response() :: %{
-                       required(\"failed\") => list(result_error_entry()()),
-                       required(\"successful\") => list(audit_event_result_entry()())
+                       required(\"failed\") => list(result_error_entry()),
+                       required(\"successful\") => list(audit_event_result_entry())
                      }
 
                  \"\"\"