fun times

hashicorp · Aug 27, 2020 · 8c70e92 · 8c70e92
1 parent edd30c1
commit 8c70e92
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/internal/provider/resource_project_test.go b/internal/provider/resource_project_test.go
@@ -141,6 +141,7 @@ func TestResourceDataToProject(t *testing.T) {
 				projectDescriptionKey: "desc",
 			},
 			expected: &scopes.Scope{
+				Scope:       &scopes.ScopeInfo{},
 				Name:        "name",
 				Description: "desc",
 			},
@@ -151,7 +152,8 @@ func TestResourceDataToProject(t *testing.T) {
 				projectNameKey: "name",
 			},
 			expected: &scopes.Scope{
-				Name: "name",
+				Scope: &scopes.ScopeInfo{},
+				Name:  "name",
 			},
 		},
 		{
@@ -160,13 +162,14 @@ func TestResourceDataToProject(t *testing.T) {
 				projectDescriptionKey: "desc",
 			},
 			expected: &scopes.Scope{
+				Scope:       &scopes.ScopeInfo{},
 				Description: "desc",
 			},
 		},
 		{
 			name:     "Not populated",
 			rData:    map[string]interface{}{},
-			expected: &scopes.Scope{},
+			expected: &scopes.Scope{Scope: &scopes.ScopeInfo{}},
 		},
 	}
 	for _, tc := range testCases {

diff --git a/internal/provider/resource_user_test.go b/internal/provider/resource_user_test.go
@@ -20,14 +20,16 @@ const (
 var (
 	orgUser = fmt.Sprintf(`
 resource "boundary_user" "foo" {
-  name = "test"
+  name        = "test"
 	description = "%s"
+  scope_id    = boundary_organization.foo.id
 }`, fooUserDescription)
 
 	orgUserUpdate = fmt.Sprintf(`
 resource "boundary_user" "foo" {
-  name = "test"
+  name        = "test"
 	description = "%s"
+  scope_id    = boundary_organization.foo.id
 }`, fooUserDescriptionUpdate)
 )
 
@@ -42,22 +44,20 @@ func TestAccUser(t *testing.T) {
 		Steps: []resource.TestStep{
 			{
 				// test create
-				Config: testConfig(url, orgUser),
+				Config: testConfig(url, fooOrg, orgUser),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckUserResourceExists("boundary_user.foo"),
 					resource.TestCheckResourceAttr("boundary_user.foo", userDescriptionKey, fooUserDescription),
 					resource.TestCheckResourceAttr("boundary_user.foo", userNameKey, "test"),
-					resource.TestCheckResourceAttr("boundary_user.foo", userScopeIDKey, tcOrg),
 				),
 			},
 			{
 				// test update description
-				Config: testConfig(url, orgUserUpdate),
+				Config: testConfig(url, fooOrg, orgUserUpdate),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckUserResourceExists("boundary_user.foo"),
 					resource.TestCheckResourceAttr("boundary_user.foo", userDescriptionKey, fooUserDescriptionUpdate),
 					resource.TestCheckResourceAttr("boundary_user.foo", userNameKey, "test"),
-					resource.TestCheckResourceAttr("boundary_user.foo", userScopeIDKey, tcOrg),
 				),
 			},
 		},