fix: rename alias and title to name

aruba-uxi · Oct 10, 2024 · bcd8225 · bcd8225
1 parent f3de22d
commit bcd8225
Show file tree

Hide file tree

Showing 13 changed files with 58 additions and 58 deletions.
diff --git a/pkg/config-api-provider/provider/data-sources/wired_network.go b/pkg/config-api-provider/provider/data-sources/wired_network.go
@@ -26,7 +26,7 @@ type wiredNetworkDataSource struct {
 
 type wiredNetworkDataSourceModel struct {
 	ID                   types.String `tfsdk:"id"`
-	Alias                types.String `tfsdk:"alias"`
+	Name                 types.String `tfsdk:"name"`
 	IpVersion            types.String `tfsdk:"ip_version"`
 	Security             types.String `tfsdk:"security"`
 	DnsLookupDomain      types.String `tfsdk:"dns_lookup_domain"`
@@ -50,7 +50,7 @@ func (d *wiredNetworkDataSource) Schema(_ context.Context, _ datasource.SchemaRe
 			"id": schema.StringAttribute{
 				Computed: true,
 			},
-			"alias": schema.StringAttribute{
+			"name": schema.StringAttribute{
 				Computed: true,
 			},
 			"ip_version": schema.StringAttribute{
@@ -116,7 +116,7 @@ func (d *wiredNetworkDataSource) Read(ctx context.Context, req datasource.ReadRe
 
 	network := networkResponse.Items[0]
 	state.ID = types.StringValue(network.Id)
-	state.Alias = types.StringValue(network.Name)
+	state.Name = types.StringValue(network.Name)
 	state.IpVersion = types.StringValue(network.IpVersion)
 	state.Security = types.StringValue(*network.Security.Get())
 	state.DnsLookupDomain = types.StringValue(*network.DnsLookupDomain.Get())

diff --git a/pkg/config-api-provider/provider/data-sources/wireless_network.go b/pkg/config-api-provider/provider/data-sources/wireless_network.go
@@ -27,7 +27,7 @@ type wirelessNetworkDataSource struct {
 type wirelessNetworkDataSourceModel struct {
 	ID                   types.String `tfsdk:"id"`
 	Ssid                 types.String `tfsdk:"ssid"`
-	Alias                types.String `tfsdk:"alias"`
+	Name                 types.String `tfsdk:"name"`
 	IpVersion            types.String `tfsdk:"ip_version"`
 	Security             types.String `tfsdk:"security"`
 	Hidden               types.Bool   `tfsdk:"hidden"`
@@ -55,7 +55,7 @@ func (d *wirelessNetworkDataSource) Schema(_ context.Context, _ datasource.Schem
 			"ssid": schema.StringAttribute{
 				Computed: true,
 			},
-			"alias": schema.StringAttribute{
+			"name": schema.StringAttribute{
 				Computed: true,
 			},
 			"ip_version": schema.StringAttribute{
@@ -125,7 +125,7 @@ func (d *wirelessNetworkDataSource) Read(ctx context.Context, req datasource.Rea
 	network := networkResponse.Items[0]
 	state.ID = types.StringValue(network.Id)
 	state.Ssid = types.StringValue(network.Ssid)
-	state.Alias = types.StringValue(network.Name)
+	state.Name = types.StringValue(network.Name)
 	state.IpVersion = types.StringValue(network.IpVersion)
 	state.Security = types.StringValue(*network.Security.Get())
 	state.Hidden = types.BoolValue(network.Hidden)

diff --git a/pkg/config-api-provider/provider/resources/service.go b/pkg/config-api-provider/provider/resources/service.go
@@ -19,15 +19,15 @@ var (
 )
 
 type serviceTestResourceModel struct {
-	ID    types.String `tfsdk:"id"`
-	Title types.String `tfsdk:"title"`
+	ID   types.String `tfsdk:"id"`
+	Name types.String `tfsdk:"name"`
 }
 
 // TODO: Switch this to use the Client Model when that becomes available
 type ServiceTestResponseModel struct {
 	Uid       string // <service_test_uid:str>,
 	Category  string // <category:str>,
-	Title     string // <title:str>,
+	Name      string // <name:str>,
 	Target    string // Nullable<<target:str>>,
 	Template  string // <template:str>,
 	IsEnabled bool   // <is_enabled:bool>
@@ -52,7 +52,7 @@ func (r *serviceTestResource) Schema(_ context.Context, _ resource.SchemaRequest
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
-			"title": schema.StringAttribute{
+			"name": schema.StringAttribute{
 				Required: true,
 			},
 		},
@@ -82,7 +82,7 @@ func (r *serviceTestResource) Read(ctx context.Context, req resource.ReadRequest
 	response := GetServiceTest(state.ID.ValueString())
 
 	// Update state from client response
-	state.Title = types.StringValue(response.Title)
+	state.Name = types.StringValue(response.Name)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -119,7 +119,7 @@ var GetServiceTest = func(uid string) ServiceTestResponseModel {
 	return ServiceTestResponseModel{
 		Uid:       uid,
 		Category:  "category",
-		Title:     "title",
+		Name:      "name",
 		Target:    "target",
 		Template:  "template",
 		IsEnabled: true,

diff --git a/pkg/config-api-provider/provider/resources/wired_network.go b/pkg/config-api-provider/provider/resources/wired_network.go
@@ -20,8 +20,8 @@ var (
 )
 
 type wiredNetworkResourceModel struct {
-	ID    types.String `tfsdk:"id"`
-	Alias types.String `tfsdk:"alias"`
+	ID   types.String `tfsdk:"id"`
+	Name types.String `tfsdk:"name"`
 }
 
 func NewWiredNetworkResource() resource.Resource {
@@ -45,7 +45,7 @@ func (r *wiredNetworkResource) Schema(_ context.Context, _ resource.SchemaReques
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
-			"alias": schema.StringAttribute{
+			"name": schema.StringAttribute{
 				Required: true,
 			},
 		},
@@ -110,7 +110,7 @@ func (r *wiredNetworkResource) Read(ctx context.Context, req resource.ReadReques
 	network := networkResponse.Items[0]
 
 	// Update state from client response
-	state.Alias = types.StringValue(network.Name)
+	state.Name = types.StringValue(network.Name)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)

diff --git a/pkg/config-api-provider/provider/resources/wireless_network.go b/pkg/config-api-provider/provider/resources/wireless_network.go
@@ -20,8 +20,8 @@ var (
 )
 
 type wirelessNetworkResourceModel struct {
-	ID    types.String `tfsdk:"id"`
-	Alias types.String `tfsdk:"alias"`
+	ID   types.String `tfsdk:"id"`
+	Name types.String `tfsdk:"name"`
 }
 
 func NewWirelessNetworkResource() resource.Resource {
@@ -45,7 +45,7 @@ func (r *wirelessNetworkResource) Schema(_ context.Context, _ resource.SchemaReq
 					stringplanmodifier.UseStateForUnknown(),
 				},
 			},
-			"alias": schema.StringAttribute{
+			"name": schema.StringAttribute{
 				Required: true,
 			},
 		},
@@ -110,7 +110,7 @@ func (r *wirelessNetworkResource) Read(ctx context.Context, req resource.ReadReq
 	network := networkResponse.Items[0]
 
 	// Update state from client response
-	state.Alias = types.StringValue(network.Name)
+	state.Name = types.StringValue(network.Name)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)

diff --git a/pkg/config-api-provider/test/data-sources/wired_network_test.go b/pkg/config-api-provider/test/data-sources/wired_network_test.go
@@ -38,7 +38,7 @@ func TestWiredNetworkDataSource(t *testing.T) {
 				`,
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "id", "uid"),
-					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "alias", "alias"),
+					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "name", "name"),
 					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "ip_version", "ip_version"),
 					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "security", "security"),
 					resource.TestCheckResourceAttr("data.uxi_wired_network.my_wired_network", "dns_lookup_domain", "dns_lookup_domain"),

diff --git a/pkg/config-api-provider/test/data-sources/wireless_network_test.go b/pkg/config-api-provider/test/data-sources/wireless_network_test.go
@@ -39,7 +39,7 @@ func TestWirelessNetworkDataSource(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "id", "uid"),
 					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "ssid", "ssid"),
-					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "alias", "alias"),
+					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "name", "name"),
 					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "ip_version", "ip_version"),
 					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "security", "security"),
 					resource.TestCheckResourceAttr("data.uxi_wireless_network.my_wireless_network", "hidden", "false"),

diff --git a/pkg/config-api-provider/test/resources/network_group_assignment_test.go b/pkg/config-api-provider/test/resources/network_group_assignment_test.go
@@ -56,7 +56,7 @@ func TestNetworkGroupAssignmentResourceForWiredNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -140,7 +140,7 @@ func TestNetworkGroupAssignmentResourceForWiredNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -155,7 +155,7 @@ func TestNetworkGroupAssignmentResourceForWiredNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network_2" {
-						alias = "alias_2"
+						name = "name_2"
 					}
 
 					import {
@@ -277,7 +277,7 @@ func TestNetworkGroupAssignmentResourceForWirelessNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wireless_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -362,7 +362,7 @@ func TestNetworkGroupAssignmentResourceForWirelessNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wireless_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -377,7 +377,7 @@ func TestNetworkGroupAssignmentResourceForWirelessNetwork(t *testing.T) {
 					}
 
 					resource "uxi_wireless_network" "my_network_2" {
-						alias = "alias_2"
+						name = "name_2"
 					}
 
 					import {
@@ -504,7 +504,7 @@ func TestNetworkGroupAssignmentResource429Handling(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -611,7 +611,7 @@ func TestNetworkGroupAssignmentResourceHttpErrorHandling(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -655,7 +655,7 @@ func TestNetworkGroupAssignmentResourceHttpErrorHandling(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -709,7 +709,7 @@ func TestNetworkGroupAssignmentResourceHttpErrorHandling(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {
@@ -766,7 +766,7 @@ func TestNetworkGroupAssignmentResourceHttpErrorHandling(t *testing.T) {
 					}
 
 					resource "uxi_wired_network" "my_network" {
-						alias = "alias"
+						name = "name"
 					}
 
 					import {

diff --git a/pkg/config-api-provider/test/resources/service_test.go b/pkg/config-api-provider/test/resources/service_test.go
@@ -27,7 +27,7 @@ func TestServiceTestResource(t *testing.T) {
 			{
 				Config: provider.ProviderConfig + `
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}`,
 
 				ExpectError: regexp.MustCompile(`(?s)creating a service_test is not supported; service_tests can only be\s*imported`),
@@ -41,7 +41,7 @@ func TestServiceTestResource(t *testing.T) {
 				},
 				Config: provider.ProviderConfig + `
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}
 
 					import {
@@ -50,7 +50,7 @@ func TestServiceTestResource(t *testing.T) {
 					}`,
 
 				Check: resource.ComposeAggregateTestCheckFunc(
-					resource.TestCheckResourceAttr("uxi_service_test.my_service_test", "title", "title"),
+					resource.TestCheckResourceAttr("uxi_service_test.my_service_test", "name", "name"),
 					resource.TestCheckResourceAttr("uxi_service_test.my_service_test", "id", "uid"),
 				),
 			},
@@ -64,7 +64,7 @@ func TestServiceTestResource(t *testing.T) {
 			{
 				Config: provider.ProviderConfig + `
 				resource "uxi_service_test" "my_service_test" {
-					title = "updated_title"
+					name = "updated_name"
 				}`,
 				ExpectError: regexp.MustCompile(`(?s)updating a service_test is not supported; service_tests can only be updated\s*through the dashboard`),
 			},

diff --git a/pkg/config-api-provider/test/resources/service_test_group_assignment_test.go b/pkg/config-api-provider/test/resources/service_test_group_assignment_test.go
@@ -56,7 +56,7 @@ func TestServiceTestGroupAssignmentResource(t *testing.T) {
 					}
 
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}
 
 					import {
@@ -126,7 +126,7 @@ func TestServiceTestGroupAssignmentResource(t *testing.T) {
 					}
 
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}
 
 					import {
@@ -141,7 +141,7 @@ func TestServiceTestGroupAssignmentResource(t *testing.T) {
 					}
 
 					resource "uxi_service_test" "my_service_test_2" {
-						title = "title_2"
+						name = "name_2"
 					}
 
 					import {
@@ -245,7 +245,7 @@ func TestServiceTestGroupAssignmentResource429Handling(t *testing.T) {
 					}
 
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}
 
 					import {
@@ -331,7 +331,7 @@ func TestServiceTestGroupAssignmentResourceHttpErrorHandling(t *testing.T) {
 					}
 
 					resource "uxi_service_test" "my_service_test" {
-						title = "title"
+						name = "name"
 					}
 
 					import {