Fix Action in ecl/managed_load_balancer/v1/load_balancers/requests (#49)

* Remove unnecessary comments from ecl/managed_load_balancer/v1

* Fix Action in ecl/managed_load_balancer/v1/load_balancers/requests

* Remove error from return value of ToLoadBalancerActionMap

* Update go version in test (1.12.x, 1.13.x -> 1.17.x, 1.18.x)

* Add v3/go.mod

.github/workflows/test.yml

@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.12.x, 1.13.x]
+        go-version: [1.17.x, 1.18.x]
         platform: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.platform }}
 

v2/ecl/managed_load_balancer/v1/certificates/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package certificates contains functionality for working with ECL Managed Load Balancer resources.
 
 Example to list certificates

v2/ecl/managed_load_balancer/v1/certificates/requests.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package certificates
 
 import (

v2/ecl/managed_load_balancer/v1/certificates/results.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package certificates
 
 import (

v2/ecl/managed_load_balancer/v1/certificates/testing/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package testing contains certificate unit tests
 */
 package testing

v2/ecl/managed_load_balancer/v1/certificates/testing/fixtures.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/certificates/testing/requests_test.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/certificates/urls.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package certificates
 
 import (

v2/ecl/managed_load_balancer/v1/health_monitors/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package health_monitors contains functionality for working with ECL Managed Load Balancer resources.
 
 Example to list health monitors

v2/ecl/managed_load_balancer/v1/health_monitors/requests.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package health_monitors
 
 import (

v2/ecl/managed_load_balancer/v1/health_monitors/results.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package health_monitors
 
 import (

v2/ecl/managed_load_balancer/v1/health_monitors/testing/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package testing contains health monitor unit tests
 */
 package testing

v2/ecl/managed_load_balancer/v1/health_monitors/testing/fixtures.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/health_monitors/testing/requests_test.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/health_monitors/urls.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package health_monitors
 
 import (

v2/ecl/managed_load_balancer/v1/listeners/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package listeners contains functionality for working with ECL Managed Load Balancer resources.
 
 Example to list listeners

v2/ecl/managed_load_balancer/v1/listeners/requests.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package listeners
 
 import (

v2/ecl/managed_load_balancer/v1/listeners/results.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package listeners
 
 import (

v2/ecl/managed_load_balancer/v1/listeners/testing/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package testing contains listener unit tests
 */
 package testing

v2/ecl/managed_load_balancer/v1/listeners/testing/fixtures.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/listeners/testing/requests_test.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (

v2/ecl/managed_load_balancer/v1/listeners/urls.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package listeners
 
 import (

v2/ecl/managed_load_balancer/v1/load_balancers/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package load_balancers contains functionality for working with ECL Managed Load Balancer resources.
 
 Example to list load balancers
@@ -117,20 +115,43 @@ Example to delete a load balancer
 
 Example to perform apply-configurations action on a load balancer
 
+	actionOpts := load_balancers.ActionOpts{
+		ApplyConfigurations: true,
+	}
+
 	id := "497f6eca-6276-4993-bfeb-53cbbbba6f08"
-	err := load_balancers.ApplyConfigurations(managedLoadBalancerClient, id).ExtractErr()
+	err := load_balancers.Action(cli, id, actionOpts).ExtractErr()
 	if err != nil {
 		panic(err)
 	}
 
 Example to perform system-update action on a load balancer
 
-	systemUpdateOpts := load_balancers.SystemUpdateOpts{
+	systemUpdate := load_balancers.ActionOptsSystemUpdate{
+		SystemUpdateID: "31746df7-92f9-4b5e-ad05-59f6684a54eb",
+	}
+	actionOpts := load_balancers.ActionOpts{
+		SystemUpdate: &systemUpdate,
+	}
+
+	id := "497f6eca-6276-4993-bfeb-53cbbbba6f08"
+	err := load_balancers.Action(cli, id, actionOpts).ExtractErr()
+	if err != nil {
+		panic(err)
+	}
+
+Example to perform apply-configurations and system-update action on a load balancer
+
+	systemUpdate := load_balancers.ActionOptsSystemUpdate{
 		SystemUpdateID: "31746df7-92f9-4b5e-ad05-59f6684a54eb",
 	}
+	actionOpts := load_balancers.ActionOpts{
+		ApplyConfigurations: true,
+		SystemUpdate: &systemUpdate,
+	}
 
 	id := "497f6eca-6276-4993-bfeb-53cbbbba6f08"
-	err := load_balancers.SystemUpdate(managedLoadBalancerClient, id, systemUpdateOpts).ExtractErr()
+	err := load_balancers.Action(cli, id, actionOpts).ExtractErr()
 	if err != nil {
 		panic(err)
 	}

v2/ecl/managed_load_balancer/v1/load_balancers/requests.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package load_balancers
 
 import (
@@ -302,42 +299,49 @@ func Delete(c *eclcloud.ServiceClient, id string) (r DeleteResult) {
 Action Load Balancer
 */
 
-// ApplyConfigurations performs action on a existing load balancer.
-func ApplyConfigurations(c *eclcloud.ServiceClient, id string) (r ActionResult) {
-	b := map[string]interface{}{"apply-configurations": nil}
-	_, r.Err = c.Post(actionURL(c, id), b, nil, &eclcloud.RequestOpts{
-		OkCodes: []int{204},
-	})
-
-	return
-}
-
-// SystemUpdateOpts represents options used to perform action on a existing load balancer.
-type SystemUpdateOpts struct {
+// ActionOptsSystemUpdate represents system-update information in the load balancer action.
+type ActionOptsSystemUpdate struct {
 
 	// - ID of the system update that will be applied to the load balancer
 	SystemUpdateID string `json:"system_update_id"`
 }
 
-// ToLoadBalancerSystemUpdateMap builds a request body from SystemUpdateOpts.
-func (opts SystemUpdateOpts) ToLoadBalancerSystemUpdateMap() (map[string]interface{}, error) {
-	return eclcloud.BuildRequestBody(opts, "system-update")
-}
+// ActionOpts represents options used to perform action on a existing load balancer.
+type ActionOpts struct {
+
+	// - Added or changed configurations of the load balancer and related resources will be applied
+	ApplyConfigurations bool `json:"apply-configurations,omitempty"`
 
-// SystemUpdateOptsBuilder allows extensions to add additional parameters to the SystemUpdate request.
-type SystemUpdateOptsBuilder interface {
-	ToLoadBalancerSystemUpdateMap() (map[string]interface{}, error)
+	// - Apply the system update to the load balancer
+	SystemUpdate *ActionOptsSystemUpdate `json:"system-update,omitempty"`
 }
 
-// SystemUpdate accepts a SystemUpdateOpts struct and performs action on a existing load balancer using the values provided.
-func SystemUpdate(c *eclcloud.ServiceClient, id string, opts SystemUpdateOptsBuilder) (r ActionResult) {
-	b, err := opts.ToLoadBalancerSystemUpdateMap()
-	if err != nil {
-		r.Err = err
+// ToLoadBalancerActionMap builds a request body from ActionOpts.
+func (opts ActionOpts) ToLoadBalancerActionMap() map[string]interface{} {
+	optsMap := make(map[string]interface{})
 
-		return
+	if opts.ApplyConfigurations {
+		optsMap["apply-configurations"] = nil
+	}
+
+	if opts.SystemUpdate != nil {
+		optsMap["system-update"] = map[string]interface{}{
+			"system_update_id": opts.SystemUpdate.SystemUpdateID,
+		}
 	}
 
+	return optsMap
+}
+
+// ActionOptsBuilder allows extensions to add additional parameters to the Action request.
+type ActionOptsBuilder interface {
+	ToLoadBalancerActionMap() map[string]interface{}
+}
+
+// Action accepts a ActionOpts struct and performs action on a existing load balancer using the values provided.
+func Action(c *eclcloud.ServiceClient, id string, opts ActionOptsBuilder) (r ActionResult) {
+	b := opts.ToLoadBalancerActionMap()
+
 	_, r.Err = c.Post(actionURL(c, id), b, nil, &eclcloud.RequestOpts{
 		OkCodes: []int{204},
 	})

v2/ecl/managed_load_balancer/v1/load_balancers/results.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package load_balancers
 
 import (

v2/ecl/managed_load_balancer/v1/load_balancers/testing/doc.go

@@ -1,6 +1,4 @@
 /*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-
 Package testing contains load balancer unit tests
 */
 package testing

v2/ecl/managed_load_balancer/v1/load_balancers/testing/fixtures.go

@@ -1,6 +1,3 @@
-/*
-Generated by https://github.com/tamac-io/openapi-to-eclcloud-rb
-*/
 package testing
 
 import (
@@ -418,18 +415,26 @@ var applyConfigurationsRequest = fmt.Sprintf(`
     "apply-configurations": null
 }`)
 
-var cancelConfigurationsRequest = fmt.Sprintf(`
+var systemUpdateRequest = fmt.Sprintf(`
 {
-    "cancel-configurations": null
+    "system-update": {
+        "system_update_id": "31746df7-92f9-4b5e-ad05-59f6684a54eb"
+    }
 }`)
 
-var systemUpdateRequest = fmt.Sprintf(`
+var applyConfigurationsAndSystemUpdateRequest = fmt.Sprintf(`
 {
+    "apply-configurations": null,
     "system-update": {
         "system_update_id": "31746df7-92f9-4b5e-ad05-59f6684a54eb"
     }
 }`)
 
+var cancelConfigurationsRequest = fmt.Sprintf(`
+{
+    "cancel-configurations": null
+}`)
+
 var createStagedRequest = fmt.Sprintf(`
 {
     "load_balancer": {