refactor(helpers): rename expandMapPtr helper (#1473)

Codelax · web-flow · commit 260d616a2828 · 2022-09-19T15:50:23.000+02:00
diff --git a/scaleway/helpers.go b/scaleway/helpers.go
@@ -621,7 +621,7 @@ func TimedOut(err error) bool {
 	return ok && timeoutErr.LastError == nil
 }
 
-func expandMapStringStringPtr(data interface{}) *map[string]string {
+func expandMapPtrStringString(data interface{}) *map[string]string {
 	if data == nil {
 		return nil
 	}
diff --git a/scaleway/helpers_container.go b/scaleway/helpers_container.go
@@ -59,7 +59,7 @@ func setCreateContainerRequest(d *schema.ResourceData, region scw.Region) (*cont
 
 	// optional
 	if envVariablesRaw, ok := d.GetOk("environment_variables"); ok {
-		req.EnvironmentVariables = expandMapStringStringPtr(envVariablesRaw)
+		req.EnvironmentVariables = expandMapPtrStringString(envVariablesRaw)
 	}
 
 	if minScale, ok := d.GetOk("min_scale"); ok {
diff --git a/scaleway/resource_container.go b/scaleway/resource_container.go
@@ -288,7 +288,7 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData
 
 	if d.HasChanges("environment_variables") {
 		envVariablesRaw := d.Get("environment_variables")
-		req.EnvironmentVariables = expandMapStringStringPtr(envVariablesRaw)
+		req.EnvironmentVariables = expandMapPtrStringString(envVariablesRaw)
 	}
 
 	if d.HasChanges("min_scale") {
diff --git a/scaleway/resource_container_namespace.go b/scaleway/resource_container_namespace.go
@@ -82,7 +82,7 @@ func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.Res
 
 	ns, err := api.CreateNamespace(&container.CreateNamespaceRequest{
 		Description:          expandStringPtr(d.Get("description").(string)),
-		EnvironmentVariables: expandMapStringStringPtr(d.Get("environment_variables")),
+		EnvironmentVariables: expandMapPtrStringString(d.Get("environment_variables")),
 		Name:                 expandOrGenerateString(d.Get("name").(string), "ns"),
 		ProjectID:            d.Get("project_id").(string),
 		Region:               region,
@@ -149,7 +149,7 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res
 	}
 
 	if d.HasChanges("environment_variables") {
-		req.EnvironmentVariables = expandMapStringStringPtr(d.Get("environment_variables"))
+		req.EnvironmentVariables = expandMapPtrStringString(d.Get("environment_variables"))
 	}
 
 	if _, err := api.UpdateNamespace(req, scw.WithContext(ctx)); err != nil {
diff --git a/scaleway/resource_function.go b/scaleway/resource_function.go
@@ -150,7 +150,7 @@ func resourceScalewayFunctionCreate(ctx context.Context, d *schema.ResourceData,
 
 	req := &function.CreateFunctionRequest{
 		Description:          expandStringPtr(d.Get("description").(string)),
-		EnvironmentVariables: expandMapStringStringPtr(d.Get("environment_variables")),
+		EnvironmentVariables: expandMapPtrStringString(d.Get("environment_variables")),
 		Handler:              expandStringPtr(d.Get("handler").(string)),
 		MaxScale:             expandUint32Ptr(d.Get("max_scale")),
 		MemoryLimit:          expandUint32Ptr(d.Get("memory_limit")),
@@ -294,7 +294,7 @@ func resourceScalewayFunctionUpdate(ctx context.Context, d *schema.ResourceData,
 	updated := false
 
 	if d.HasChange("environment_variables") {
-		req.EnvironmentVariables = expandMapStringStringPtr(d.Get("environment_variables"))
+		req.EnvironmentVariables = expandMapPtrStringString(d.Get("environment_variables"))
 		updated = true
 	}
 
diff --git a/scaleway/resource_function_namespace.go b/scaleway/resource_function_namespace.go
@@ -75,7 +75,7 @@ func resourceScalewayFunctionNamespaceCreate(ctx context.Context, d *schema.Reso
 
 	ns, err := api.CreateNamespace(&function.CreateNamespaceRequest{
 		Description:          expandStringPtr(d.Get("description").(string)),
-		EnvironmentVariables: expandMapStringStringPtr(d.Get("environment_variables")),
+		EnvironmentVariables: expandMapPtrStringString(d.Get("environment_variables")),
 		Name:                 expandOrGenerateString(d.Get("name").(string), "func-"),
 		ProjectID:            d.Get("project_id").(string),
 		Region:               region,
@@ -146,7 +146,7 @@ func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.Reso
 	}
 
 	if d.HasChanges("environment_variables") {
-		req.EnvironmentVariables = expandMapStringStringPtr(d.Get("environment_variables"))
+		req.EnvironmentVariables = expandMapPtrStringString(d.Get("environment_variables"))
 	}
 
 	if _, err := api.UpdateNamespace(req, scw.WithContext(ctx)); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -621,7 +621,7 @@ func TimedOut(err error) bool {`
`621`	`621`	`return ok && timeoutErr.LastError == nil`
`622`	`622`	`}`
`623`	`623`
`624`		`-func expandMapStringStringPtr(data interface{}) *map[string]string {`
	`624`	`+func expandMapPtrStringString(data interface{}) *map[string]string {`
`625`	`625`	`if data == nil {`
`626`	`626`	`return nil`
`627`	`627`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func setCreateContainerRequest(d schema.ResourceData, region scw.Region) (cont`
`59`	`59`
`60`	`60`	`// optional`
`61`	`61`	`if envVariablesRaw, ok := d.GetOk("environment_variables"); ok {`
`62`		`- req.EnvironmentVariables = expandMapStringStringPtr(envVariablesRaw)`
	`62`	`+ req.EnvironmentVariables = expandMapPtrStringString(envVariablesRaw)`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`if minScale, ok := d.GetOk("min_scale"); ok {`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ func resourceScalewayContainerUpdate(ctx context.Context, d *schema.ResourceData`
`288`	`288`
`289`	`289`	`if d.HasChanges("environment_variables") {`
`290`	`290`	`envVariablesRaw := d.Get("environment_variables")`
`291`		`- req.EnvironmentVariables = expandMapStringStringPtr(envVariablesRaw)`
	`291`	`+ req.EnvironmentVariables = expandMapPtrStringString(envVariablesRaw)`
`292`	`292`	`}`
`293`	`293`
`294`	`294`	`if d.HasChanges("min_scale") {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ func resourceScalewayContainerNamespaceCreate(ctx context.Context, d *schema.Res`
`82`	`82`
`83`	`83`	`ns, err := api.CreateNamespace(&container.CreateNamespaceRequest{`
`84`	`84`	`Description: expandStringPtr(d.Get("description").(string)),`
`85`		`- EnvironmentVariables: expandMapStringStringPtr(d.Get("environment_variables")),`
	`85`	`+ EnvironmentVariables: expandMapPtrStringString(d.Get("environment_variables")),`
`86`	`86`	`Name: expandOrGenerateString(d.Get("name").(string), "ns"),`
`87`	`87`	`ProjectID: d.Get("project_id").(string),`
`88`	`88`	`Region: region,`
`@@ -149,7 +149,7 @@ func resourceScalewayContainerNamespaceUpdate(ctx context.Context, d *schema.Res`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`if d.HasChanges("environment_variables") {`
`152`		`- req.EnvironmentVariables = expandMapStringStringPtr(d.Get("environment_variables"))`
	`152`	`+ req.EnvironmentVariables = expandMapPtrStringString(d.Get("environment_variables"))`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`if _, err := api.UpdateNamespace(req, scw.WithContext(ctx)); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func resourceScalewayFunctionNamespaceCreate(ctx context.Context, d *schema.Reso`
`75`	`75`
`76`	`76`	`ns, err := api.CreateNamespace(&function.CreateNamespaceRequest{`
`77`	`77`	`Description: expandStringPtr(d.Get("description").(string)),`
`78`		`- EnvironmentVariables: expandMapStringStringPtr(d.Get("environment_variables")),`
	`78`	`+ EnvironmentVariables: expandMapPtrStringString(d.Get("environment_variables")),`
`79`	`79`	`Name: expandOrGenerateString(d.Get("name").(string), "func-"),`
`80`	`80`	`ProjectID: d.Get("project_id").(string),`
`81`	`81`	`Region: region,`
`@@ -146,7 +146,7 @@ func resourceScalewayFunctionNamespaceUpdate(ctx context.Context, d *schema.Reso`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`if d.HasChanges("environment_variables") {`
`149`		`- req.EnvironmentVariables = expandMapStringStringPtr(d.Get("environment_variables"))`
	`149`	`+ req.EnvironmentVariables = expandMapPtrStringString(d.Get("environment_variables"))`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`if _, err := api.UpdateNamespace(req, scw.WithContext(ctx)); err != nil {`