haveapi-go-client 0.27.0 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb661e4d9dd5ab5b29d5d3b63af4b37a486848e0623a6e34ac41f53f0a0feebe
-  data.tar.gz: 485e7d815e181bf209d541a0eb63c305acd79440cba6144812263b25108369de
+  metadata.gz: ceeb8d0d4bc76fb773c1f67cdc49be58d1e04569d256fd8b7613bbfd6eb655bf
+  data.tar.gz: 816f8ef02aff59ebfa107c8ff7a0debda73efe363b99f70f32f1e66d69563d40
 SHA512:
-  metadata.gz: c6ff55c1c5d592a79c5052df6ee2ea9311e0039b7d37068d9048d592ee2fe0b63913c9dca088387abf57a1937b015a75c4bf3c664a20aac9875f62e2d88236d3
-  data.tar.gz: 06014c3863378caf51e02c6b6be0d919f740d6659974c185915ec89a8b0a4bd07434e625481599704ead36f3565e718fd0817462d6400462a0dcda01abd1097d
+  metadata.gz: 4a6dc5489b9e68b75faf32bc47f781df8b6df12a5f30058aa6dacc1ae5dd66c418075434f7f6fcd21d0563af2609357a0ac8c6c69fb9ca8efc878d0d7ffcf886
+  data.tar.gz: a8e5c3f45534a242438496370bbe226f25818303a3d492766397ee5df2cfef7f6bfd6bd03a11227b7b9d4f256e125aaf82325a7d8398488cf27c0f1ea5934425

data/haveapi-go-client.gemspec

@@ -18,5 +18,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'haveapi-client', '~> 0.27.0'
+  spec.add_dependency 'haveapi-client', '~> 0.27.2'
 end

data/lib/haveapi/go_client/parameters/typed.rb

@@ -6,6 +6,15 @@ module HaveAPI::GoClient
       !%w[Custom Resource].include?(desc[:type])
     end
 
+    def initialize(io, name, desc)
+      super
+      @required = desc[:required]
+    end
+
+    def nillable?
+      @required != true
+    end
+
     protected
 
     def do_resolve

data/lib/haveapi/go_client/version.rb

@@ -1,5 +1,5 @@
 module HaveAPI
   module GoClient
-    VERSION = '0.27.0'.freeze
+    VERSION = '0.27.2'.freeze
   end
 end

data/spec/integration/generator_spec.rb

@@ -132,6 +132,78 @@ RSpec.describe HaveAPI::GoClient::Generator do
           }
         }
 
+        func TestEchoResourceOptionalAcceptsNil(t *testing.T) {
+          c := newValidationClient()
+          req := c.Test.EchoResourceOptional.Prepare()
+          in := req.NewInput()
+          in.SetProjectNil(true)
+
+          resp, err := req.Call()
+          if err != nil {
+            t.Fatalf("request failed: %v", err)
+          }
+
+          if !resp.Status {
+            t.Fatalf("request failed: %s", resp.Message)
+          }
+
+          if !resp.Output.ProjectNil {
+            t.Fatalf("expected ProjectNil=true, got false")
+          }
+
+          if !resp.Output.ProjectProvided {
+            t.Fatalf("expected ProjectProvided=true, got false")
+          }
+        }
+
+        func TestEchoOptionalAcceptsNil(t *testing.T) {
+          c := newValidationClient()
+          req := c.Test.EchoOptional.Prepare()
+          in := req.NewInput()
+          in.SetDtNil(true)
+
+          resp, err := req.Call()
+          if err != nil {
+            t.Fatalf("request failed: %v", err)
+          }
+
+          if !resp.Status {
+            t.Fatalf("request failed: %s", resp.Message)
+          }
+
+          if !resp.Output.DtNil {
+            t.Fatalf("expected DtNil=true, got false")
+          }
+
+          if !resp.Output.DtProvided {
+            t.Fatalf("expected DtProvided=true, got false")
+          }
+        }
+
+        func TestEchoOptionalGetAcceptsNil(t *testing.T) {
+          c := newValidationClient()
+          req := c.Test.EchoOptionalGet.Prepare()
+          in := req.NewInput()
+          in.SetDtNil(true)
+
+          resp, err := req.Call()
+          if err != nil {
+            t.Fatalf("request failed: %v", err)
+          }
+
+          if !resp.Status {
+            t.Fatalf("request failed: %s", resp.Message)
+          }
+
+          if !resp.Output.DtNil {
+            t.Fatalf("expected DtNil=true, got false")
+          }
+
+          if !resp.Output.DtProvided {
+            t.Fatalf("expected DtProvided=true, got false")
+          }
+        }
+
         func TestEchoAcceptsValidInput(t *testing.T) {
           c := newValidationClient()
           req := c.Test.Echo.Prepare()

data/template/action.go.erb

@@ -562,26 +562,42 @@ func (resp *<%= action.go_response_type %>) CancelOperation() (*ActionActionStat
 <% if action.http_method == 'GET' && action.has_input? -%>
 func (inv *<%= action.go_invocation_type %>) convertInputToQueryParams(ret map[string]string) {
 	if inv.Input != nil {
-<% action.input.parameters.each do |p| -%>
+	<% action.input.parameters.each do |p| -%>
 		if inv.IsParameterSelected("<%= p.go_name %>") {
+	<% if p.nillable? -%>
+			if inv.IsParameterNil("<%= p.go_name %>") {
+				ret["<%= action.input.namespace %>[<%= p.name %>]"] = ""
+			} else {
+				ret["<%= action.input.namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
+			}
+	<% else -%>
 			ret["<%= action.input.namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.Input.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.Input.<%= p.go_name %>)<% end %>
+	<% end -%>
 		}
-<% end -%>
+	<% end -%>
 	}
 }
 <% end -%>
 
-<% if action.http_method == 'GET' && action.metadata.has_global_input? -%>
-func (inv *<%= action.go_invocation_type %>) convertMetaInputToQueryParams(ret map[string]string) {
-	if inv.MetaInput != nil {
-<% action.metadata.global.input.parameters.each do |p| -%>
-		if inv.IsMetaParameterSelected("<%= p.go_name %>") {
-			ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
+	<% if action.http_method == 'GET' && action.metadata.has_global_input? -%>
+	func (inv *<%= action.go_invocation_type %>) convertMetaInputToQueryParams(ret map[string]string) {
+		if inv.MetaInput != nil {
+	<% action.metadata.global.input.parameters.each do |p| -%>
+			if inv.IsMetaParameterSelected("<%= p.go_name %>") {
+	<% if p.nillable? -%>
+				if inv.IsMetaParameterNil("<%= p.go_name %>") {
+					ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = ""
+				} else {
+					ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
+				}
+	<% else -%>
+				ret["<%= action.resource.api_version.metadata_namespace %>[<%= p.name %>]"] = <% if p.go_in_type == 'string' %>inv.MetaInput.<%= p.go_name %><% else %>convert<%= p.go_in_type.capitalize %>ToString(inv.MetaInput.<%= p.go_name %>)<% end %>
+	<% end -%>
+			}
+	<% end -%>
 		}
-<% end -%>
 	}
-}
-<% end -%>
+	<% end -%>
 
 <% if action.http_method != 'GET' && (action.has_input? || action.metadata.has_global_input?) -%>
 func (inv *<%= action.go_invocation_type %>) makeAllInputParams() *<%= action.go_request_type %> {
@@ -619,19 +635,27 @@ func (inv *<%= action.go_invocation_type %>) makeInputParams() map[string]interf
 }
 <% end -%>
 
-<% if action.metadata.has_global_input? -%>
-func (inv *<%= action.go_invocation_type %>) makeMetaInputParams() map[string]interface{} {
-	ret := make(map[string]interface{})
+	<% if action.metadata.has_global_input? -%>
+	func (inv *<%= action.go_invocation_type %>) makeMetaInputParams() map[string]interface{} {
+		ret := make(map[string]interface{})
 
-	if inv.MetaInput != nil {
-<% action.metadata.global.input.parameters.each do |p| -%>
-		if inv.IsMetaParameterSelected("<%= p.go_name %>") {
-			ret["<%= p.name %>"] = inv.MetaInput.<%= p.go_name %>
+		if inv.MetaInput != nil {
+	<% action.metadata.global.input.parameters.each do |p| -%>
+			if inv.IsMetaParameterSelected("<%= p.go_name %>") {
+	<% if p.nillable? -%>
+				if inv.IsMetaParameterNil("<%= p.go_name %>") {
+					ret["<%= p.name %>"] = nil
+				} else {
+					ret["<%= p.name %>"] = inv.MetaInput.<%= p.go_name %>
+				}
+	<% else -%>
+				ret["<%= p.name %>"] = inv.MetaInput.<%= p.go_name %>
+	<% end -%>
+			}
+	<% end -%>
 		}
-<% end -%>
-	}
 
-	return ret
+		return ret
 }
 <% end -%>
 <% end -%>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi-go-client
 version: !ruby/object:Gem::Version
-  version: 0.27.0
+  version: 0.27.2
 platform: ruby
 authors:
 - Jakub Skokan
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.27.0
+        version: 0.27.2
 description: Go client generator
 email:
 - jakub.skokan@vpsfree.cz