CORE-656/Add manage_ip_whitelist permission to account section

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.9.3 (March 4, 2021)
+BUG FIXES:
+* Adds missing `account_manage_ip_whitelist` permission [#148](https://github.com/ns1-terraform/terraform-provider-ns1/pull/148).
+
 ## 1.9.2 (February 26, 2021)
 BUG FIXES:
 * Values for `tls_skip_verify` are coerced correctly [#146](https://github.com/ns1-terraform/terraform-provider-ns1/pull/146). Thanks @zahiar!

go.mod

@@ -6,7 +6,7 @@ require (
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.4.0
 	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/ns1/ns1-go.v2 v2.4.2
+	gopkg.in/ns1/ns1-go.v2 v2.4.4
 	gopkg.in/yaml.v2 v2.2.7 // indirect
 )
 

ns1/permissions.go

@@ -101,6 +101,12 @@ func addPermsSchema(s map[string]*schema.Schema) map[string]*schema.Schema {
 		Default:          false,
 		DiffSuppressFunc: suppressPermissionDiff,
 	}
+	s["account_manage_ip_whitelist"] = &schema.Schema{
+		Type:             schema.TypeBool,
+		Optional:         true,
+		Default:          false,
+		DiffSuppressFunc: suppressPermissionDiff,
+	}
 	s["monitoring_manage_lists"] = &schema.Schema{
 		Type:             schema.TypeBool,
 		Optional:         true,
@@ -209,6 +215,7 @@ func permissionsToResourceData(d *schema.ResourceData, permissions account.Permi
 	d.Set("account_manage_account_settings", permissions.Account.ManageAccountSettings)
 	d.Set("account_view_activity_log", permissions.Account.ViewActivityLog)
 	d.Set("account_view_invoices", permissions.Account.ViewInvoices)
+	d.Set("account_manage_ip_whitelist", permissions.Account.ManageIPWhitelist)
 	d.Set("monitoring_manage_lists", permissions.Monitoring.ManageLists)
 	d.Set("monitoring_manage_jobs", permissions.Monitoring.ManageJobs)
 	d.Set("monitoring_view_jobs", permissions.Monitoring.ViewJobs)
@@ -288,6 +295,9 @@ func resourceDataToPermissions(d *schema.ResourceData) account.PermissionsMap {
 	if v, ok := d.GetOk("account_view_invoices"); ok {
 		p.Account.ViewInvoices = v.(bool)
 	}
+	if v, ok := d.GetOk("account_manage_ip_whitelist"); ok {
+		p.Account.ManageIPWhitelist = v.(bool)
+	}
 	if v, ok := d.GetOk("monitoring_manage_lists"); ok {
 		p.Monitoring.ManageLists = v.(bool)
 	}

ns1/permissions_migrations.go

@@ -108,6 +108,12 @@ func addPermsSchemaV0(s map[string]*schema.Schema) map[string]*schema.Schema {
 		Default:          false,
 		DiffSuppressFunc: suppressPermissionDiff,
 	}
+	s["account_manage_ip_whitelist"] = &schema.Schema{
+		Type:             schema.TypeBool,
+		Optional:         true,
+		Default:          false,
+		DiffSuppressFunc: suppressPermissionDiff,
+	}
 	s["monitoring_manage_lists"] = &schema.Schema{
 		Type:             schema.TypeBool,
 		Optional:         true,

ns1/resource_apikey_test.go

@@ -127,6 +127,7 @@ func TestAccAPIKey_permissions(t *testing.T) {
 					testAccCheckAPIKeyName(&apiKey, name),
 					// The key should still have this permission, it would have inherited it from the team.
 					resource.TestCheckResourceAttr("ns1_apikey.it", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_apikey.it", "account_manage_ip_whitelist", "true"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -137,6 +138,7 @@ func TestAccAPIKey_permissions(t *testing.T) {
 					testAccCheckAPIKeyName(&apiKey, name),
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_apikey.it", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_apikey.it", "account_manage_ip_whitelist", "false"),
 				),
 			},
 		},
@@ -246,6 +248,7 @@ func testAccAPIKeyPermissionsOnTeam(rString string) string {
 	return fmt.Sprintf(`resource "ns1_team" "t" {
   name = "terraform acc test team %s"
   account_manage_account_settings = true
+  account_manage_ip_whitelist = true
 }
 
 resource "ns1_apikey" "it" {
@@ -261,6 +264,7 @@ func testAccAPIKeyPermissionsNoTeam(rString string) string {
 	return fmt.Sprintf(`resource "ns1_team" "t" {
   name = "terraform acc test team %s"
   account_manage_account_settings = true
+  account_manage_ip_whitelist = true
 }
 
 resource "ns1_apikey" "it" {

ns1/resource_user_test.go

@@ -108,6 +108,7 @@ func TestAccUser_permissions(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 			{
@@ -118,6 +119,7 @@ func TestAccUser_permissions(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			{
@@ -129,6 +131,7 @@ func TestAccUser_permissions(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					// The user should still have this permission, it would have inherited it from the team.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -141,6 +144,7 @@ func TestAccUser_permissions(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 		},
@@ -166,6 +170,7 @@ func TestAccUser_permissions_empty_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			// Strange Terraform behavior causes explicitly settings a users team to []
@@ -178,6 +183,7 @@ func TestAccUser_permissions_empty_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -190,6 +196,7 @@ func TestAccUser_permissions_empty_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 		},
@@ -216,6 +223,7 @@ func TestAccUser_permissions_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 			{
@@ -226,6 +234,7 @@ func TestAccUser_permissions_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			{
@@ -237,6 +246,7 @@ func TestAccUser_permissions_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					// The user should still have this permission, it would have inherited it from the team.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -249,6 +259,7 @@ func TestAccUser_permissions_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 		},
@@ -275,6 +286,7 @@ func TestAccUser_permissions_multiple_teams(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			{
@@ -286,6 +298,7 @@ func TestAccUser_permissions_multiple_teams(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 			{
@@ -297,6 +310,7 @@ func TestAccUser_permissions_multiple_teams(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			{
@@ -309,6 +323,7 @@ func TestAccUser_permissions_multiple_teams(t *testing.T) {
 					// The user should still have this permission, it would have inherited it from the team.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -322,6 +337,7 @@ func TestAccUser_permissions_multiple_teams(t *testing.T) {
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 		},
@@ -348,6 +364,7 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "name", name),
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 			{
@@ -359,6 +376,7 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "true"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 			{
@@ -370,6 +388,7 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 					resource.TestCheckResourceAttr("ns1_user.u", "username", username),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 			},
 			{
@@ -382,6 +401,7 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 					// The user should still have this permission, it would have inherited it from the team.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "true"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "false"),
 				),
 				ExpectNonEmptyPlan: true,
 			},
@@ -395,6 +415,7 @@ func TestAccUser_permissions_multiple_teams_start_no_team(t *testing.T) {
 					// But if an apply is ran again, the permission will be removed.
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_account_settings", "false"),
 					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_apikeys", "false"),
+					resource.TestCheckResourceAttr("ns1_user.u", "account_manage_ip_whitelist", "true"),
 				),
 			},
 		},
@@ -613,6 +634,7 @@ func testAccUserPermissionsOnTeam(rString string) string {
 	return fmt.Sprintf(`resource "ns1_team" "t" {
   name = "terraform acc test team %s"
   account_manage_account_settings = true
+  account_manage_ip_whitelist = false
 }
 
 resource "ns1_user" "u" {
@@ -643,6 +665,8 @@ resource "ns1_user" "u" {
   notify = {
     billing = false
   }
+
+  account_manage_ip_whitelist = true
 }
 `, rString, rString, rString)
 }
@@ -677,6 +701,7 @@ func testAccUserPermissionsOnTwoTeam(rString string) string {
 resource "ns1_team" "t2" {
   name = "terraform acc test team %s-2"
   account_manage_apikeys = true
+  account_manage_ip_whitelist = true
 }
 
 resource "ns1_user" "u" {
@@ -689,6 +714,8 @@ resource "ns1_user" "u" {
   notify = {
     billing = false
   }
+
+  account_manage_ip_whitelist = true
 }
 `, rString, rString, rString, rString)
 }