Add missing import tests

grafana/resource_organization_test.go

@@ -44,6 +44,22 @@ func TestAccOrganization_basic(t *testing.T) {
 					),
 				),
 			},
+			{
+				ResourceName:            "grafana_organization.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"admins", "admin_user", "create_users"}, // Users are imported explicitly (with create_users == false)
+				ImportStateCheck: func(s []*terraform.InstanceState) error {
+					if len(s) != 1 {
+						return fmt.Errorf("expected 1 state: %#v", s)
+					}
+					admin := s[0].Attributes["admins.0"]
+					if admin != "admin@localhost" {
+						return fmt.Errorf("expected admin@localhost: %s", admin)
+					}
+					return nil
+				},
+			},
 		},
 	})
 }
@@ -168,6 +184,12 @@ func TestAccOrganization_defaultAdmin(t *testing.T) {
 					),
 				),
 			},
+			{
+				ResourceName:            "grafana_organization.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"admin_user", "create_user"}, // These are provider-side attributes and aren't returned by the API
+			},
 		},
 	})
 }

grafana/resource_team.go

@@ -106,6 +106,7 @@ func ReadTeam(ctx context.Context, d *schema.ResourceData, meta interface{}) dia
 	if err != nil {
 		return diag.FromErr(err)
 	}
+	d.Set("team_id", teamID)
 	d.Set("name", resp.Name)
 	if resp.Email != "" {
 		d.Set("email", resp.Email)

grafana/resource_team_test.go

@@ -47,6 +47,11 @@ func TestAccTeam_basic(t *testing.T) {
 					),
 				),
 			},
+			{
+				ResourceName:      "grafana_team.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 		},
 	})
 }
@@ -97,6 +102,12 @@ func TestAccTeam_Members(t *testing.T) {
 					),
 				),
 			},
+			// Test the import with members
+			{
+				ResourceName:      "grafana_team.test",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
 			{
 				Config: testAccTeamConfig_memberRemove,
 				Check: resource.ComposeTestCheckFunc(

grafana/resource_user_test.go

@@ -62,6 +62,12 @@ func TestAccUser_basic(t *testing.T) {
 					),
 				),
 			},
+			{
+				ResourceName:            "grafana_user.test",
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"password"},
+			},
 		},
 	})
 }