Fix for endpoint_params Mastercard#202

harshavmb · Aug 12, 2023 · 46a0cb2 · 46a0cb2
1 parent 9e200d3
commit 46a0cb2
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 18 deletions.
diff --git a/docs/index.md b/docs/index.md
@@ -73,5 +73,5 @@ Required:
 
 Optional:
 
-- `endpoint_params` (Map of List of String) Additional key/values to pass to the underlying Oauth client library (as EndpointParams)
+- `endpoint_params` (Map of Strings) Additional key/values to pass to the underlying Oauth client library (as EndpointParams). Look in examples/ directory for an example
 - `oauth_scopes` (List of String) scopes
diff --git a/examples/workingexamples/provider_with_oauth.tf b/examples/workingexamples/provider_with_oauth.tf
@@ -5,9 +5,14 @@ provider "restapi" {
   write_returns_object = true
 
   oauth_client_credentials {
-      oauth_client_id = "example"
-      oauth_client_secret = "example"
-      oauth_token_endpoint = "https://example.com/tokenendpoint"
-      oauth_scopes = ["openid"]
+    oauth_client_id      = "example"
+    oauth_client_secret  = "example"
+    oauth_token_endpoint = "https://example.com/tokenendpoint"
+    oauth_scopes         = ["openid"]
+    endpoint_params      = <<ENDPOINT_PARAMS
+    {
+      "resource": "http://127.0.0.1/"
+    }
+    ENDPOINT_PARAMS
   }
 }
diff --git a/restapi/provider.go b/restapi/provider.go
@@ -6,6 +6,8 @@ import (
 	"net/url"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
 )
 
 /*Provider implements the REST API provider*/
@@ -157,13 +159,11 @@ func Provider() *schema.Provider {
 							Description: "scopes",
 						},
 						"endpoint_params": {
-							Type:        schema.TypeMap,
-							Optional:    true,
-							Description: "Additional key/values to pass to the underlying Oauth client library (as EndpointParams)",
-							Elem: &schema.Schema{
-								Type: schema.TypeList,
-								Elem: &schema.Schema{Type: schema.TypeString},
-							},
+							Type:             schema.TypeString,
+							Optional:         true,
+							ValidateFunc:     validation.StringIsJSON,
+							Description:      "Additional key/values to pass to the underlying Oauth client library (as EndpointParams)",
+							DiffSuppressFunc: structure.SuppressJsonDiff,
 						},
 					},
 				},
@@ -261,13 +261,14 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
 		opt.oauthTokenURL = oauthConfig["oauth_token_endpoint"].(string)
 		opt.oauthScopes = expandStringSet(oauthConfig["oauth_scopes"].([]interface{}))
 
-		if tmp, ok := oauthConfig["endpoint_params"]; ok {
-			m := tmp.(map[string]interface{})
+		if endPointParamString := oauthConfig["endpoint_params"].(string); endPointParamString != "" {
+			endPointParams, err := structure.ExpandJsonFromString(endPointParamString)
+			if err != nil {
+				return fmt.Errorf("unable to parse settings: %s", err), err
+			}
 			setVals := url.Values{}
-			for k, vals := range m {
-				for _, val := range vals.([]string) {
-					setVals.Add(k, val)
-				}
+			for k, vals := range endPointParams {
+				setVals.Set(k, vals.(string))
 			}
 			opt.oauthEndpointParams = setVals
 		}