Merge branch 'main' into ay/feat/acceptance-tests/sensor

.gitattributes

@@ -1,2 +1,3 @@
 pkg/config-api-client/** linguist-generated=true
+docs/** linguist-generated=true
 pkg/config-api-client/test/** linguist-generated=false

.github/workflows/lint-test-code.yaml

@@ -51,7 +51,8 @@ jobs:
       - name: Check Provider docs up to date
         run: |
           just generate-provider-docs
-          git diff --exit-code -- docs
+          git add --all docs
+          git diff --cached --exit-code -- docs || exit 1
 
       - name: Check Provider docs valid
         run: just validate-provider-docs

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Hewlett Packard Enterprise Development LP
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -9,15 +9,15 @@ go_path = $(go env GOPATH)/bin
 
 ```
 dev_overrides {
-    "registry.terraform.io/arubauxi/configuration" = "<go_path>"
+    "registry.terraform.io/arubauxi/hpeuxi" = "<go_path>"
 }
 ```
 
 Example `~/.terraformrc` file
 ```
 provider_installation {
   dev_overrides {
-      "registry.terraform.io/arubauxi/configuration" = "/Users/<user>/go/bin"
+      "registry.terraform.io/arubauxi/hpeuxi" = "/Users/<user>/go/bin"
   }
   direct {}
 }

examples/full-demo/main.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     uxi = {
-      source = "registry.terraform.io/arubauxi/configuration"
+      source = "registry.terraform.io/arubauxi/hpeuxi"
     }
   }
 }

go.mod

@@ -1,11 +1,11 @@
-module github.com/aruba-uxi/terraform-provider-configuration
+module github.com/aruba-uxi/terraform-provider-hpeuxi
 
 go 1.21
 
 toolchain go1.22.5
 
 require (
-	github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client v0.0.0-00010101000000-000000000000
+	github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client v0.0.0-00010101000000-000000000000
 	github.com/h2non/gock v1.2.0
 	github.com/hashicorp/terraform-plugin-framework v1.10.0
 	github.com/hashicorp/terraform-plugin-go v0.23.0
@@ -68,4 +68,4 @@ require (
 	google.golang.org/protobuf v1.34.0 // indirect
 )
 
-replace github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client => ./pkg/config-api-client
+replace github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client => ./pkg/config-api-client

internal/provider/datasources/agent.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -24,17 +24,14 @@ type agentDataSource struct {
 }
 
 type agentDataSourceModel struct {
-	Id                 types.String  `tfsdk:"id"`
-	Serial             types.String  `tfsdk:"serial"`
-	Name               types.String  `tfsdk:"name"`
-	ModelNumber        types.String  `tfsdk:"model_number"`
-	WifiMacAddress     types.String  `tfsdk:"wifi_mac_address"`
-	EthernetMacAddress types.String  `tfsdk:"ethernet_mac_address"`
-	AddressNote        types.String  `tfsdk:"address_note"`
-	Longitude          types.Float32 `tfsdk:"longitude"`
-	Latitude           types.Float32 `tfsdk:"latitude"`
-	Notes              types.String  `tfsdk:"notes"`
-	PcapMode           types.String  `tfsdk:"pcap_mode"`
+	Id                 types.String `tfsdk:"id"`
+	Serial             types.String `tfsdk:"serial"`
+	Name               types.String `tfsdk:"name"`
+	ModelNumber        types.String `tfsdk:"model_number"`
+	WifiMacAddress     types.String `tfsdk:"wifi_mac_address"`
+	EthernetMacAddress types.String `tfsdk:"ethernet_mac_address"`
+	Notes              types.String `tfsdk:"notes"`
+	PcapMode           types.String `tfsdk:"pcap_mode"`
 	Filter             struct {
 		AgentID types.String `tfsdk:"agent_id"`
 	} `tfsdk:"filter"`
@@ -73,15 +70,6 @@ func (d *agentDataSource) Schema(
 			"ethernet_mac_address": schema.StringAttribute{
 				Computed: true,
 			},
-			"address_note": schema.StringAttribute{
-				Computed: true,
-			},
-			"longitude": schema.Float32Attribute{
-				Computed: true,
-			},
-			"latitude": schema.Float32Attribute{
-				Computed: true,
-			},
 			"notes": schema.StringAttribute{
 				Computed: true,
 			},
@@ -137,6 +125,7 @@ func (d *agentDataSource) Read(
 
 	state.Id = types.StringValue(agent.Id)
 	state.Name = types.StringValue(agent.Name)
+	state.Serial = types.StringValue(agent.Serial)
 	state.ModelNumber = types.StringPointerValue(agent.ModelNumber.Get())
 	state.WifiMacAddress = types.StringPointerValue(agent.WifiMacAddress.Get())
 	state.EthernetMacAddress = types.StringPointerValue(agent.EthernetMacAddress.Get())

internal/provider/datasources/agent_group_assignment.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/datasources/group.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/datasources/network_group_assignment.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/datasources/sensor.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"
@@ -137,6 +137,7 @@ func (d *sensorDataSource) Read(
 
 	state.Id = types.StringValue(sensor.Id)
 	state.Name = types.StringValue(sensor.Name)
+	state.Serial = types.StringValue(sensor.Serial)
 	state.ModelNumber = types.StringValue(sensor.ModelNumber)
 	state.WifiMacAddress = types.StringPointerValue(sensor.WifiMacAddress.Get())
 	state.EthernetMacAddress = types.StringPointerValue(sensor.EthernetMacAddress.Get())

internal/provider/datasources/sensor_group_assignment.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"

internal/provider/datasources/service.go

@@ -3,8 +3,8 @@ package datasources
 import (
 	"context"
 
-	config_api_client "github.com/aruba-uxi/terraform-provider-configuration-api/pkg/config-api-client"
-	"github.com/aruba-uxi/terraform-provider-configuration/internal/provider/util"
+	"github.com/aruba-uxi/terraform-provider-hpeuxi/internal/provider/util"
+	config_api_client "github.com/aruba-uxi/terraform-provider-hpeuxi/pkg/config-api-client"
 	"github.com/hashicorp/terraform-plugin-framework/datasource"
 	"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
 	"github.com/hashicorp/terraform-plugin-framework/types"