rename account to team

ramonsnir · ramonsnir · commit 0ae347422e75 · 2024-06-13T09:23:46.000-04:00
diff --git a/docs/data-sources/dns_zone.md b/docs/data-sources/dns_zone.md
@@ -21,12 +21,12 @@ description: |-
 
 ### Read-Only
 
-- `account_id` (String)
-- `account_slug` (String)
 - `dns_servers` (List of String)
 - `domain` (Attributes) (see [below for nested schema](#nestedatt--domain))
 - `id` (String) The ID of this resource.
 - `records` (Attributes List) (see [below for nested schema](#nestedatt--records))
+- `team_id` (String)
+- `team_slug` (String)
 
 <a id="nestedatt--domain"></a>
 ### Nested Schema for `domain`
diff --git a/docs/data-sources/site.md b/docs/data-sources/site.md
@@ -17,8 +17,8 @@ description: |-
 
 ### Optional
 
-- `account_slug` (String)
 - `name` (String)
+- `team_slug` (String)
 
 ### Read-Only
 
diff --git a/docs/data-sources/sites.md b/docs/data-sources/sites.md
@@ -17,7 +17,7 @@ description: |-
 
 ### Required
 
-- `account_slug` (String)
+- `team_slug` (String)
 
 ### Read-Only
 
@@ -28,8 +28,8 @@ description: |-
 
 Read-Only:
 
-- `account_slug` (String)
 - `custom_domain` (String)
 - `domain_aliases` (List of String)
 - `id` (String)
 - `name` (String)
+- `team_slug` (String)
diff --git a/docs/data-sources/team.md b/docs/data-sources/team.md
@@ -1,12 +1,12 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "netlify_account Data Source - netlify"
+page_title: "netlify_team Data Source - netlify"
 subcategory: ""
 description: |-
   
 ---
 
-# netlify_account (Data Source)
+# netlify_team (Data Source)
 
 
 
diff --git a/docs/resources/dns_zone.md b/docs/resources/dns_zone.md
@@ -17,16 +17,16 @@ description: |-
 
 ### Required
 
-- `account_slug` (String)
 - `name` (String)
+- `team_slug` (String)
 
 ### Read-Only
 
-- `account_id` (String)
 - `dns_servers` (List of String)
 - `domain` (Attributes) (see [below for nested schema](#nestedatt--domain))
 - `id` (String) The ID of this resource.
 - `last_updated` (String)
+- `team_id` (String)
 
 <a id="nestedatt--domain"></a>
 ### Nested Schema for `domain`
diff --git a/docs/resources/environment_variable.md b/docs/resources/environment_variable.md
@@ -17,8 +17,8 @@ description: |-
 
 ### Required
 
-- `account_id` (String)
 - `key` (String)
+- `team_id` (String)
 
 ### Optional
 
diff --git a/docs/resources/site_firewall_traffic_rules.md b/docs/resources/site_firewall_traffic_rules.md
@@ -23,8 +23,8 @@ description: |-
 
 ### Read-Only
 
-- `account_id` (String)
 - `last_updated` (String)
+- `team_id` (String)
 
 <a id="nestedatt--published"></a>
 ### Nested Schema for `published`
diff --git a/docs/resources/team_firewall_traffic_rules.md b/docs/resources/team_firewall_traffic_rules.md
@@ -1,12 +1,12 @@
 ---
 # generated by https://github.com/hashicorp/terraform-plugin-docs
-page_title: "netlify_account_firewall_traffic_rules Resource - netlify"
+page_title: "netlify_team_firewall_traffic_rules Resource - netlify"
 subcategory: ""
 description: |-
   
 ---
 
-# netlify_account_firewall_traffic_rules (Resource)
+# netlify_team_firewall_traffic_rules (Resource)
 
 
 
@@ -17,8 +17,8 @@ description: |-
 
 ### Required
 
-- `account_id` (String)
 - `published` (Attributes) (see [below for nested schema](#nestedatt--published))
+- `team_id` (String)
 - `unpublished` (Attributes) (see [below for nested schema](#nestedatt--unpublished))
 
 ### Read-Only
diff --git a/examples/dns/main.tf b/examples/dns/main.tf
@@ -10,13 +10,13 @@ terraform {
 # `token` comes from NETLIFY_API_TOKEN, but can be specified with a Terraform variable
 provider "netlify" {}
 
-# data "netlify_account" "current" {
+# data "netlify_team" "current" {
 #   slug = "ramon-test-1"
 # }
 
 resource "netlify_dns_zone" "example" {
-  account_slug = "ramon-test-1" // data.netlify_account.current.slug
-  name         = "example-tf-test-test.com"
+  team_slug = "ramon-test-1" // data.netlify_team.current.slug
+  name      = "example-tf-test-test.com"
   lifecycle {
     prevent_destroy = true
   }
diff --git a/examples/env_vars/main.tf b/examples/env_vars/main.tf
@@ -10,19 +10,19 @@ terraform {
 # `token` comes from NETLIFY_API_TOKEN, but can be specified with a Terraform variable
 provider "netlify" {}
 
-data "netlify_account" "current" {
+data "netlify_team" "current" {
   slug = "ramon-test-1"
 }
 
 data "netlify_site" "platform_test" {
-  account_slug = data.netlify_account.current.slug
-  name         = "platform-test-1"
+  team_slug = data.netlify_team.current.slug
+  name      = "platform-test-1"
 }
 
 resource "netlify_environment_variable" "woof" {
-  account_id = data.netlify_account.current.id
-  site_id    = data.netlify_site.platform_test.id
-  key        = "WOOF"
+  team_id = data.netlify_team.current.id
+  site_id = data.netlify_site.platform_test.id
+  key     = "WOOF"
   values = [
     {
       value   = "dogs are here",
@@ -32,9 +32,9 @@ resource "netlify_environment_variable" "woof" {
 }
 
 resource "netlify_environment_variable" "meow" {
-  account_id = data.netlify_account.current.id
-  site_id    = data.netlify_site.platform_test.id
-  key        = "TEST_MEOW"
+  team_id = data.netlify_team.current.id
+  site_id = data.netlify_site.platform_test.id
+  key     = "TEST_MEOW"
   values = [
     {
       value   = "roflmaocopter",
@@ -44,9 +44,9 @@ resource "netlify_environment_variable" "meow" {
 }
 
 resource "netlify_environment_variable" "secret_meow" {
-  account_id = data.netlify_account.current.id
-  site_id    = data.netlify_site.platform_test.id
-  key        = "SECRET_TEST_MEOW"
+  team_id = data.netlify_team.current.id
+  site_id = data.netlify_site.platform_test.id
+  key     = "SECRET_TEST_MEOW"
   secret_values = [
     {
       value   = "secret roflmaocopter",
@@ -60,8 +60,8 @@ resource "netlify_environment_variable" "secret_meow" {
 }
 
 resource "netlify_environment_variable" "global_meow" {
-  account_id = data.netlify_account.current.id
-  key        = "TEST_MEOW"
+  team_id = data.netlify_team.current.id
+  key     = "TEST_MEOW"
   values = [
     {
       value   = "global roflmaocopter",
diff --git a/examples/firewall_traffic_rules/main.tf b/examples/firewall_traffic_rules/main.tf
@@ -11,11 +11,11 @@ terraform {
 provider "netlify" {}
 
 data "netlify_site" "test4" {
-  account_slug = "netlify-testing"
-  name         = "ramontest4"
+  team_slug = "netlify-testing"
+  name      = "ramontest4"
 }
 
-# TODO: add an example for netlify_account_firewall_traffic_rules
+# TODO: add an example for netlify_team_firewall_traffic_rules
 
 resource "netlify_site_firewall_traffic_rules" "ramontest4" {
   site_id = data.netlify_site.test4.id
diff --git a/examples/log_drains/main.tf b/examples/log_drains/main.tf
@@ -11,8 +11,8 @@ terraform {
 provider "netlify" {}
 
 data "netlify_site" "test4" {
-  account_slug = "netlify-testing"
-  name         = "ramontest4"
+  team_slug = "netlify-testing"
+  name      = "ramontest4"
 }
 
 resource "netlify_log_drain" "ramontest4" {
diff --git a/examples/site_data_sources/main.tf b/examples/site_data_sources/main.tf
@@ -10,17 +10,17 @@ terraform {
 # `token` comes from NETLIFY_API_TOKEN, but can be specified with a Terraform variable
 provider "netlify" {}
 
-data "netlify_account" "current" {
+data "netlify_team" "current" {
   slug = "ramon-test-1"
 }
 
 data "netlify_site" "platform_test" {
-  account_slug = data.netlify_account.current.slug
-  name         = "platform-test-1"
+  team_slug = data.netlify_team.current.slug
+  name      = "platform-test-1"
 }
 
 data "netlify_sites" "all" {
-  account_slug = "netlify-testing"
+  team_slug = "netlify-testing"
 }
 
 output "sites" {
diff --git a/examples/site_settings/main.tf b/examples/site_settings/main.tf
@@ -11,8 +11,8 @@ terraform {
 provider "netlify" {}
 
 data "netlify_site" "platform_test" {
-  account_slug = "ramon-test-1"
-  name         = "platform-test-1"
+  team_slug = "ramon-test-1"
+  name      = "platform-test-1"
 }
 
 resource "netlify_site_build_settings" "platform_test" {
diff --git a/internal/provider/dns_zone_data_source.go b/internal/provider/dns_zone_data_source.go
@@ -29,13 +29,13 @@ type dnsZoneDataSource struct {
 }
 
 type dnsZoneDataSourceModel struct {
-	ID          types.String        `tfsdk:"id"`
-	Name        types.String        `tfsdk:"name"`
-	AccountID   types.String        `tfsdk:"account_id"`
-	AccountSlug types.String        `tfsdk:"account_slug"`
-	DnsServers  types.List          `tfsdk:"dns_servers"`
-	Domain      *netlifyDomainModel `tfsdk:"domain"`
-	Records     []dnsRecordModel    `tfsdk:"records"`
+	ID         types.String        `tfsdk:"id"`
+	Name       types.String        `tfsdk:"name"`
+	TeamID     types.String        `tfsdk:"team_id"`
+	TeamSlug   types.String        `tfsdk:"team_slug"`
+	DnsServers types.List          `tfsdk:"dns_servers"`
+	Domain     *netlifyDomainModel `tfsdk:"domain"`
+	Records    []dnsRecordModel    `tfsdk:"records"`
 }
 
 type dnsRecordModel struct {
@@ -84,10 +84,10 @@ func (d *dnsZoneDataSource) Schema(_ context.Context, _ datasource.SchemaRequest
 				Optional: true,
 				Computed: true,
 			},
-			"account_id": schema.StringAttribute{
+			"team_id": schema.StringAttribute{
 				Computed: true,
 			},
-			"account_slug": schema.StringAttribute{
+			"team_slug": schema.StringAttribute{
 				Computed: true,
 			},
 			"domain": schema.SingleNestedAttribute{
@@ -201,8 +201,8 @@ func (d *dnsZoneDataSource) Read(ctx context.Context, req datasource.ReadRequest
 
 	config.ID = types.StringValue(zone.Id)
 	config.Name = types.StringValue(zone.Name)
-	config.AccountID = types.StringValue(zone.AccountId)
-	config.AccountSlug = types.StringValue(zone.AccountSlug)
+	config.TeamID = types.StringValue(zone.AccountId)
+	config.TeamSlug = types.StringValue(zone.AccountSlug)
 	dnsServers := make([]types.String, len(zone.DnsServers))
 	for i, dnsServer := range zone.DnsServers {
 		dnsServers[i] = types.StringValue(dnsServer)
diff --git a/internal/provider/dns_zone_resource.go b/internal/provider/dns_zone_resource.go
@@ -34,8 +34,8 @@ type dnsZoneResourceModel struct {
 	ID          types.String        `tfsdk:"id"`
 	LastUpdated types.String        `tfsdk:"last_updated"`
 	Name        types.String        `tfsdk:"name"`
-	AccountID   types.String        `tfsdk:"account_id"`
-	AccountSlug types.String        `tfsdk:"account_slug"`
+	TeamID      types.String        `tfsdk:"team_id"`
+	TeamSlug    types.String        `tfsdk:"team_slug"`
 	DnsServers  types.List          `tfsdk:"dns_servers"`
 	Domain      *netlifyDomainModel `tfsdk:"domain"`
 }
@@ -80,13 +80,13 @@ func (r *dnsZoneResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 					stringplanmodifier.RequiresReplace(),
 				},
 			},
-			"account_id": schema.StringAttribute{
+			"team_id": schema.StringAttribute{
 				Computed: true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
-			"account_slug": schema.StringAttribute{
+			"team_slug": schema.StringAttribute{
 				Required: true,
 				PlanModifiers: []planmodifier.String{
 					stringplanmodifier.RequiresReplace(),
@@ -139,25 +139,25 @@ func (r *dnsZoneResource) Create(ctx context.Context, req resource.CreateRequest
 	dnsZone, _, err := r.data.client.DNSZonesAPI.
 		CreateDnsZone(ctx).
 		DnsZoneCreateParams(netlifyapi.DnsZoneCreateParams{
-			AccountSlug: plan.AccountSlug.ValueStringPointer(),
+			AccountSlug: plan.TeamSlug.ValueStringPointer(),
 			Name:        plan.Name.ValueStringPointer(),
 		}).
 		Execute()
 	if err != nil {
 		resp.Diagnostics.AddError(
 			"Error creating Netlify DNS zone",
 			fmt.Sprintf(
-				"Could not create Netlify DNS zone %q (account slug: %q): %q",
+				"Could not create Netlify DNS zone %q (team slug: %q): %q",
 				plan.Name.ValueString(),
-				plan.AccountSlug.ValueString(),
+				plan.TeamSlug.ValueString(),
 				err.Error(),
 			),
 		)
 		return
 	}
 	plan.ID = types.StringValue(dnsZone.Id)
 	plan.LastUpdated = types.StringValue(time.Now().Format(time.RFC3339))
-	plan.AccountID = types.StringValue(dnsZone.AccountId)
+	plan.TeamID = types.StringValue(dnsZone.AccountId)
 	dnsServers := make([]types.String, len(dnsZone.DnsServers))
 	for i, dnsServer := range dnsZone.DnsServers {
 		dnsServers[i] = types.StringValue(dnsServer)
@@ -217,8 +217,8 @@ func (r *dnsZoneResource) Read(ctx context.Context, req resource.ReadRequest, re
 		return
 	}
 	state.Name = types.StringValue(dnsZone.Name)
-	state.AccountID = types.StringValue(dnsZone.AccountId)
-	state.AccountSlug = types.StringValue(dnsZone.AccountSlug)
+	state.TeamID = types.StringValue(dnsZone.AccountId)
+	state.TeamSlug = types.StringValue(dnsZone.AccountSlug)
 	dnsServers := make([]types.String, len(dnsZone.DnsServers))
 	for i, dnsServer := range dnsZone.DnsServers {
 		dnsServers[i] = types.StringValue(dnsServer)
diff --git a/internal/provider/environment_variable_resource.go b/internal/provider/environment_variable_resource.go
diff --git a/internal/provider/firewall_traffic_rules_resource.go b/internal/provider/firewall_traffic_rules_resource.go
diff --git a/internal/provider/provider.go b/internal/provider/provider.go
diff --git a/internal/provider/site_data_source.go b/internal/provider/site_data_source.go
diff --git a/internal/provider/sites_data_source.go b/internal/provider/sites_data_source.go
diff --git a/internal/provider/team_data_source.go b/internal/provider/team_data_source.go
