Use ExactlyOneOf instead of ConflictsWith

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/provider.go

@@ -18,11 +18,11 @@ func Provider() *schema.Provider {
 	p := &schema.Provider{
 		Schema: map[string]*schema.Schema{
 			"token": {
-				Type:          schema.TypeString,
-				Optional:      true,
-				DefaultFunc:   schema.EnvDefaultFunc("GITHUB_TOKEN", nil),
-				Description:   descriptions["token"],
-				ConflictsWith: []string{"app_auth"},
+				Type:         schema.TypeString,
+				Optional:     true,
+				DefaultFunc:  schema.EnvDefaultFunc("GITHUB_TOKEN", nil),
+				Description:  descriptions["token"],
+				ExactlyOneOf: []string{"app_auth"},
 			},
 			"owner": {
 				Type:        schema.TypeString,
@@ -94,11 +94,11 @@ func Provider() *schema.Provider {
 				Description: descriptions["parallel_requests"],
 			},
 			"app_auth": {
-				Type:          schema.TypeList,
-				Optional:      true,
-				MaxItems:      1,
-				Description:   descriptions["app_auth"],
-				ConflictsWith: []string{"token"},
+				Type:         schema.TypeList,
+				Optional:     true,
+				MaxItems:     1,
+				Description:  descriptions["app_auth"],
+				ExactlyOneOf: []string{"token"},
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"id": {

github/provider_test.go

@@ -245,7 +245,7 @@ func TestAccProviderConfigure(t *testing.T) {
 			Steps: []resource.TestStep{
 				{
 					Config:      config,
-					ExpectError: regexp.MustCompile("\"app_auth\": conflicts with token"),
+					ExpectError: regexp.MustCompile("only one of `app_auth,token` can be specified"),
 				},
 			},
 		})
@@ -270,7 +270,7 @@ func TestAccProviderConfigure(t *testing.T) {
 			Steps: []resource.TestStep{
 				{
 					Config:      config,
-					ExpectError: regexp.MustCompile("\"app_auth\": conflicts with token"),
+					ExpectError: regexp.MustCompile("only one of `app_auth,token` can be specified"),
 				},
 			},
 		})