Merge pull request #2721 from gophercloud/bp-v1-699db20

mandre · web-flow · commit 37e8bbf09e74 · 2023-08-08T13:52:38.000+02:00
[v1] orchestration: Explicit error in optionsmap creation
diff --git a/openstack/orchestration/v1/stacks/requests.go b/openstack/orchestration/v1/stacks/requests.go
@@ -1,6 +1,7 @@
 package stacks
 
 import (
+	"fmt"
 	"strings"
 
 	"github.com/gophercloud/gophercloud"
@@ -89,7 +90,7 @@ func (opts CreateOpts) ToStackCreateMap() (map[string]interface{}, error) {
 func Create(c *gophercloud.ServiceClient, opts CreateOptsBuilder) (r CreateResult) {
 	b, err := opts.ToStackCreateMap()
 	if err != nil {
-		r.Err = err
+		r.Err = fmt.Errorf("error creating the options map: %w", err)
 		return
 	}
 	resp, err := c.Post(createURL(c), b, &r.Body, nil)
diff --git a/openstack/orchestration/v1/stacks/testing/requests_test.go b/openstack/orchestration/v1/stacks/testing/requests_test.go
@@ -59,7 +59,7 @@ func TestCreateStackMissingRequiredInOpts(t *testing.T) {
 		DisableRollback: gophercloud.Disabled,
 	}
 	r := stacks.Create(fake.ServiceClient(), createOpts)
-	th.AssertEquals(t, "Missing input for argument [Name]", r.Err.Error())
+	th.AssertEquals(t, "error creating the options map: Missing input for argument [Name]", r.Err.Error())
 }
 
 func TestAdoptStack(t *testing.T) {

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func TestCreateStackMissingRequiredInOpts(t *testing.T) {`
`59`	`59`	`DisableRollback: gophercloud.Disabled,`
`60`	`60`	`}`
`61`	`61`	`r := stacks.Create(fake.ServiceClient(), createOpts)`
`62`		`- th.AssertEquals(t, "Missing input for argument [Name]", r.Err.Error())`
	`62`	`+ th.AssertEquals(t, "error creating the options map: Missing input for argument [Name]", r.Err.Error())`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func TestAdoptStack(t *testing.T) {`