Working commit

Author: LukeJowett

restapi/api_client.go

@@ -43,6 +43,8 @@ type apiClientOpt struct {
 	xssiPrefix          string
 	useCookies          bool
 	rateLimit           float64
+	oauthClientIDEnvVar string 
+	oauthClientSecretEnvVar string
 	oauthClientID       string
 	oauthClientSecret   string
 	oauthScopes         []string
@@ -82,6 +84,13 @@ type APIClient struct {
 	oauthConfig         *clientcredentials.Config
 }
 
+func GetEnvStringOrDefault(key, def string) string {
+if env := os.Getenv(key); env != "" {
+	return env
+}
+return def
+}
+
 // NewAPIClient makes a new api client for RESTful calls
 func NewAPIClient(opt *apiClientOpt) (*APIClient, error) {
 	if opt.debug {
@@ -205,7 +214,10 @@ func NewAPIClient(opt *apiClientOpt) (*APIClient, error) {
 		debug:               opt.debug,
 	}
 
-	if opt.oauthClientID != "" && opt.oauthClientSecret != "" && opt.oauthTokenURL != "" {
+    resolvedClientID := GetEnvStringOrDefault(opt.oauthClientIDEnvVar, opt.oauthClientID)
+	resolvedClientSecret := GetEnvStringOrDefault(opt.oauthClientSecretEnvVar, opt.oauthClientSecret)
+
+	if resolvedClientID != "" && resolvedClientSecret != "" && opt.oauthTokenURL != "" {
 		client.oauthConfig = &clientcredentials.Config{
 			ClientID:       opt.oauthClientID,
 			ClientSecret:   opt.oauthClientSecret,

restapi/provider.go

@@ -135,15 +135,25 @@ func Provider() *schema.Provider {
 				Description: "Configuration for oauth client credential flow using the https://pkg.go.dev/golang.org/x/oauth2 implementation",
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"oauth_client_id_environment_variable": {
+							Type:        schema.TypeString,
+							Description: "Name of client id environment variable, when using an environment variable to specify the client id",
+							Optional:    true,
+						},
+						"oauth_client_secret_environment_variable": {
+							Type:        schema.TypeString,
+							Description: "Name of client secret environment variable, when using an environment variable to specify the client id",
+							Optional:    true,
+						},												
 						"oauth_client_id": {
 							Type:        schema.TypeString,
 							Description: "client id",
-							Required:    true,
+							Optional:    true,
 						},
 						"oauth_client_secret": {
 							Type:        schema.TypeString,
 							Description: "client secret",
-							Required:    true,
+							Optional:    true,
 						},
 						"oauth_token_endpoint": {
 							Type:        schema.TypeString,
@@ -214,6 +224,7 @@ func Provider() *schema.Provider {
 			"restapi_object": dataSourceRestAPI(),
 		},
 		ConfigureFunc: configureProvider,
+		
 	}
 }
 
@@ -267,6 +278,8 @@ func configureProvider(d *schema.ResourceData) (interface{}, error) {
 	if v, ok := d.GetOk("oauth_client_credentials"); ok {
 		oauthConfig := v.([]interface{})[0].(map[string]interface{})
 
+		opt.oauthClientIDEnvVar = oauthConfig["oauth_client_id_environment_variable"].(string)
+		opt.oauthClientSecretEnvVar = oauthConfig["oauth_client_secret_environment_variable"].(string)
 		opt.oauthClientID = oauthConfig["oauth_client_id"].(string)
 		opt.oauthClientSecret = oauthConfig["oauth_client_secret"].(string)
 		opt.oauthTokenURL = oauthConfig["oauth_token_endpoint"].(string)