Merge branch 'master' of github.com:alexkappa/terraform-provider-auth0

Author: alexkappa

auth0/resource_auth0_client_grant.go

@@ -98,8 +98,11 @@ func buildClientGrant(d *schema.ResourceData) *management.ClientGrant {
 	g := &management.ClientGrant{
 		ClientID: String(d, "client_id"),
 		Audience: String(d, "audience"),
-		Scope:    Slice(d, "scope"),
 	}
-
+	if scope, ok := d.GetOk("scope"); ok {
+		g.Scope = scope.([]interface{})
+	} else {
+		g.Scope = []interface{}{}
+	}
 	return g
 }

auth0/resource_auth0_client_grant_test.go

@@ -18,11 +18,17 @@ func TestAccClientGrant(t *testing.T) {
 				Config: testAccClientGrantConfigCreate,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_client_grant.my_client_grant", "audience", "https://api.example.com/client-grant-test"),
-					resource.TestCheckResourceAttr("auth0_client_grant.my_client_grant", "scope.0", "create:foo"),
+					resource.TestCheckResourceAttr("auth0_client_grant.my_client_grant", "scope.#", "0"),
 				),
 			},
 			{
 				Config: testAccClientGrantConfigUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("auth0_client_grant.my_client_grant", "scope.0", "create:foo"),
+				),
+			},
+			{
+				Config: testAccClientGrantConfigUpdateAgain,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("auth0_client_grant.my_client_grant", "scope.#", "0"),
 				),
@@ -56,7 +62,7 @@ resource "auth0_resource_server" "my_resource_server" {
 resource "auth0_client_grant" "my_client_grant" {
   client_id = "${auth0_client.my_client.id}"
   audience = "${auth0_resource_server.my_resource_server.identifier}"
-  scope = [ "create:foo" ]
+  scope = [ ]
 }
 `
 
@@ -85,6 +91,35 @@ resource "auth0_resource_server" "my_resource_server" {
 resource "auth0_client_grant" "my_client_grant" {
   client_id = "${auth0_client.my_client.id}"
   audience = "${auth0_resource_server.my_resource_server.identifier}"
-  scope = [ ] # empty scope
+  scope = [ "create:foo" ] 
+}
+`
+
+const testAccClientGrantConfigUpdateAgain = `
+provider "auth0" {}
+
+resource "auth0_client" "my_client" {
+  name = "Application - Client Grant - Acceptance Test"
+  custom_login_page_on = true
+  is_first_party = true
+}
+
+resource "auth0_resource_server" "my_resource_server" {
+  name = "Resource Server - Client Grant - Acceptance Test"
+  identifier = "https://api.example.com/client-grant-test"
+  scopes {
+       value = "create:foo"
+       description = "Create foos"
+  }
+  scopes {
+       value = "create:bar"
+       description = "Create bars"
+  }
+}
+
+resource "auth0_client_grant" "my_client_grant" {
+  client_id = "${auth0_client.my_client.id}"
+  audience = "${auth0_resource_server.my_resource_server.identifier}"
+  scope = [ ]
 }
 `