Merge pull request #193 from ThiagoYU/DAITDS-250

DAITDS-250 - Team and user import support added

Author: Zach-Johnson

ns1/resource_team.go

@@ -43,6 +43,7 @@ func teamResource() *schema.Resource {
 		Read:          TeamRead,
 		Update:        TeamUpdate,
 		Delete:        TeamDelete,
+		Importer:      &schema.ResourceImporter{State: teamImportStateFunc},
 		SchemaVersion: 1,
 		StateUpgraders: []schema.StateUpgrader{
 			{
@@ -155,3 +156,7 @@ func TeamUpdate(d *schema.ResourceData, meta interface{}) error {
 	// because teams don't have a concept of what users and keys are assigned to them, only the other way around.
 	return teamToResourceData(d, &t)
 }
+
+func teamImportStateFunc(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	return []*schema.ResourceData{d}, nil
+}

ns1/resource_team_test.go

@@ -112,6 +112,48 @@ func TestAccTeam_ManualDelete(t *testing.T) {
 	})
 }
 
+// Import user test
+func TestAccTeam_import_test(t *testing.T) {
+	var team account.Team
+	n := fmt.Sprintf("terraform test team %s", acctest.RandStringFromCharSet(15, acctest.CharSetAlphaNum))
+	ignored_fields := []string{"dhcp_manage_dhcp", "dhcp_view_dhcp", "ipam_manage_ipam", "ipam_view_ipam", "dns_records"}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckTeamDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(testAccTeamBasic, n),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckTeamExists("ns1_team.foobar", &team),
+					testAccCheckTeamName(&team, n),
+					testAccCheckTeamDNSPermission(&team, "view_zones", true),
+					testAccCheckTeamDNSPermission(&team, "zones_allow_by_default", true),
+					testAccCheckTeamDNSPermissionZones(&team, "zones_allow", []string{"mytest.zone"}),
+					testAccCheckTeamDNSPermissionZones(&team, "zones_deny", []string{"myother.zone"}),
+					testAccCheckTeamDNSPermissionRecords(&team, "dns_records_allow", []account.PermissionsRecord{
+						{Domain: "my.ns1.com", Subdomains: false, Zone: "ns1.com", RecordType: "A"}}),
+					testAccCheckTeamDNSPermissionRecords(&team, "dns_records_deny", []account.PermissionsRecord{
+						{Domain: "my.test.com", Subdomains: true, Zone: "test.com", RecordType: "A"}}),
+					testAccCheckTeamDataPermission(&team, "manage_datasources", true),
+					testAccCheckTeamIPWhitelists(&team, []account.IPWhitelist{
+						{Name: "whitelist-1", Values: []string{"1.1.1.1", "2.2.2.2"}},
+						{Name: "whitelist-2", Values: []string{"3.3.3.3", "4.4.4.4"}},
+					}),
+				),
+			},
+			{
+				ResourceName:      "ns1_team.foobar",
+				ImportState:       true,
+				ImportStateVerify: true,
+				// Ignoring some fields because of how the dns_records work right now
+				ImportStateVerifyIgnore: ignored_fields,
+			},
+		},
+	})
+}
+
 func testAccCheckTeamExists(n string, team *account.Team) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]

ns1/resource_user.go

@@ -12,7 +12,7 @@ import (
 	"gopkg.in/ns1/ns1-go.v2/rest/model/account"
 )
 
-var usernameRegex = regexp.MustCompile(`^([a-zA-Z0-9_+.@]+)$`)
+var usernameRegex = regexp.MustCompile(`^[a-zA-Z0-9@$&'*+\-=? ^_.{|}~]{3,320}$`)
 
 func userResource() *schema.Resource {
 	s := map[string]*schema.Schema{
@@ -59,6 +59,7 @@ func userResource() *schema.Resource {
 		Read:          UserRead,
 		Update:        UserUpdate,
 		Delete:        UserDelete,
+		Importer:      &schema.ResourceImporter{State: userImportStateFunc},
 		SchemaVersion: 1,
 		StateUpgraders: []schema.StateUpgrader{
 			{
@@ -72,6 +73,7 @@ func userResource() *schema.Resource {
 
 func userToResourceData(d *schema.ResourceData, u *account.User) error {
 	d.SetId(u.Username)
+	d.Set("username", u.Username)
 	d.Set("name", u.Name)
 	d.Set("email", u.Email)
 	d.Set("teams", u.TeamIDs)
@@ -214,3 +216,7 @@ func validateUsername(
 	}
 	return warns, errs
 }
+
+func userImportStateFunc(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	return []*schema.ResourceData{d}, nil
+}

ns1/resource_user_test.go

@@ -435,6 +435,45 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 	})
 }
 
+// Import user test
+func TestAccUser_import_test(t *testing.T) {
+	var user account.User
+	rString := acctest.RandStringFromCharSet(15, acctest.CharSetAlphaNum)
+	name := fmt.Sprintf("terraform acc test user %s", rString)
+	username := fmt.Sprintf("tf_acc_test_user_%s", rString)
+	ignored_fields := []string{"dhcp_manage_dhcp", "dhcp_view_dhcp", "ipam_manage_ipam", "ipam_view_ipam"}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckUserDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccUserBasic(rString),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckUserExists("ns1_user.u", &user),
+					resource.TestCheckResourceAttr("ns1_user.u", "email", "tf_acc_test_ns1@hashicorp.com"),
+					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
+					resource.TestCheckResourceAttr("ns1_user.u", "teams.#", "1"),
+					resource.TestCheckResourceAttr("ns1_user.u", "notify.%", "1"),
+					resource.TestCheckResourceAttr("ns1_user.u", "notify.billing", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
+					testAccCheckUserIPWhitelists(&user, []string{"1.1.1.1", "2.2.2.2"}),
+					resource.TestCheckResourceAttr("ns1_user.u", "ip_whitelist_strict", "true"),
+				),
+			},
+			{
+				ResourceName:      "ns1_user.u",
+				ImportState:       true,
+				ImportStateId:     username,
+				ImportStateVerify: true,
+				// Ignoring some fields because of how the permissions work right now
+				ImportStateVerifyIgnore: ignored_fields,
+			},
+		},
+	})
+}
+
 // Case when a user is on a team and that team updates it's permissions.
 // This test is currently failing, as this is not implemented yet - this doesn't
 // actually cause any issues because it's just Terraforms state that doesn't have the
@@ -516,11 +555,6 @@ func TestValidateUsername(t *testing.T) {
 			"valid_us3r@example.com",
 			0,
 		},
-		{
-			"invalid - dash",
-			"inv4lid-user",
-			1,
-		},
 		{
 			"invalid - punctuation",
 			"inv@l!d_us3r",

website/docs/r/team.html.markdown

@@ -94,6 +94,10 @@ Only relevant for the DDI product.
 * `ipam_view_ipam` - (Optional) Whether the team can view IPAM.
 Only relevant for the DDI product.
 
+## Import
+
+`terraform import ns1_team.<name> <team_id>`
+
 ## Attributes Reference
 
 All of the arguments listed above are exported as attributes, with no

website/docs/r/user.html.markdown

@@ -89,6 +89,10 @@ Only relevant for the DDI product.
 * `ipam_manage_ipam` - (Optional) Whether the user can manage IPAM.
 Only relevant for the DDI product.
 
+## Import
+
+`terraform import ns1_user.<name> <username>`
+
 ## Attributes Reference
 
 All of the arguments listed above are exported as attributes, with no