resource(switch_port_settings): remove unused attributes

Author: sudomateo

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/hashicorp/terraform-plugin-log v0.9.0
 	github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0
 	github.com/hashicorp/terraform-plugin-testing v1.13.2
-	github.com/oxidecomputer/oxide.go v0.5.1-0.20250721184220-01e729a38434
+	github.com/oxidecomputer/oxide.go v0.5.1-0.20250721231911-34f457098cbb
 	github.com/stretchr/testify v1.10.0
 )
 

go.sum

@@ -136,8 +136,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
-github.com/oxidecomputer/oxide.go v0.5.1-0.20250721184220-01e729a38434 h1:m5PJ1CyZsQ/85VsuooZd7QGIMvjPpu/atA3+vThDhbs=
-github.com/oxidecomputer/oxide.go v0.5.1-0.20250721184220-01e729a38434/go.mod h1:4gfHlxdBQLs/34UbChPvINd+pGNAnGlASRGEd4xIz1Y=
+github.com/oxidecomputer/oxide.go v0.5.1-0.20250721231911-34f457098cbb h1:5X/J81LYoezL6GRj5k3YhaPgv8tX5jx6My5ea+CCGtk=
+github.com/oxidecomputer/oxide.go v0.5.1-0.20250721231911-34f457098cbb/go.mod h1:4gfHlxdBQLs/34UbChPvINd+pGNAnGlASRGEd4xIz1Y=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pjbgf/sha1cd v0.3.2 h1:a9wb0bp1oC2TGwStyn0Umc/IGKQnEgF0vVaZ8QF8eo4=

internal/provider/resource_switch_port_settings.go

@@ -35,8 +35,6 @@ type switchPortSettingsModel struct {
 	Description  types.String                       `tfsdk:"description"`
 	Addresses    []switchPortSettingsAddressModel   `tfsdk:"addresses"`
 	BGPPeers     []switchPortSettingsBGPPeerModel   `tfsdk:"bgp_peers"`
-	Groups       []types.String                     `tfsdk:"groups"`
-	Interfaces   []switchPortSettingsInterfaceModel `tfsdk:"interfaces"`
 	Links        []switchPortSettingsLinkModel      `tfsdk:"links"`
 	PortConfig   *switchPortSettingsPortConfigModel `tfsdk:"port_config"`
 	Routes       []switchPortSettingsRouteModel     `tfsdk:"routes"`
@@ -92,17 +90,6 @@ type switchPortSettingsBGPPeerPeerAllowedImportModel struct {
 	Value []types.String `tfsdk:"value"`
 }
 
-type switchPortSettingsInterfaceModel struct {
-	Kind      *switchPortSettingsInterfaceKindModel `tfsdk:"kind"`
-	LinkName  types.String                          `tfsdk:"link_name"`
-	V6Enabled types.Bool                            `tfsdk:"v6_enabled"`
-}
-
-type switchPortSettingsInterfaceKindModel struct {
-	Type types.String `tfsdk:"type"`
-	VID  types.Int32  `tfsdk:"vid"`
-}
-
 type switchPortSettingsLinkModel struct {
 	Autoneg  types.Bool                       `tfsdk:"autoneg"`
 	FEC      types.String                     `tfsdk:"fec"`
@@ -342,48 +329,6 @@ func (r *switchPortSettingsResource) Schema(ctx context.Context, _ resource.Sche
 				Required:    true,
 				Description: "Human-readable description of the switch port settings.",
 			},
-			"groups": schema.SetAttribute{
-				Optional:    true,
-				ElementType: types.StringType,
-				Description: "Set of port settings group IDs to include in these settings.",
-			},
-			"interfaces": schema.SetNestedAttribute{
-				Optional:    true,
-				Description: "Interface configuration for the switch port.",
-				NestedObject: schema.NestedAttributeObject{
-					Attributes: map[string]schema.Attribute{
-						"kind": schema.SingleNestedAttribute{
-							Required:    true,
-							Description: "The kind of interface this configuration represents.",
-							Attributes: map[string]schema.Attribute{
-								"type": schema.StringAttribute{
-									Required:    true,
-									Description: "Type of the interface.",
-									Validators: []validator.String{
-										stringvalidator.OneOf(
-											string(oxide.SwitchInterfaceKindTypePrimary),
-											string(oxide.SwitchInterfaceKindTypeVlan),
-											string(oxide.SwitchInterfaceKindTypeLoopback),
-										),
-									},
-								},
-								"vid": schema.Int32Attribute{
-									Optional:    true,
-									Description: "VLAN ID for the interfaces.",
-								},
-							},
-						},
-						"link_name": schema.StringAttribute{
-							Required:    true,
-							Description: "Name of the link this interface is associated with.",
-						},
-						"v6_enabled": schema.BoolAttribute{
-							Optional:    true,
-							Description: "Enable IPv6 on this interface.",
-						},
-					},
-				},
-			},
 			"links": schema.SetNestedAttribute{
 				Required:    true,
 				Description: "Link configuration for the switch port.",
@@ -664,8 +609,6 @@ func (r *switchPortSettingsResource) Read(ctx context.Context, req resource.Read
 	// types.
 	state.Addresses = model.Addresses
 	state.BGPPeers = model.BGPPeers
-	state.Groups = model.Groups
-	state.Interfaces = model.Interfaces
 	state.Links = model.Links
 	state.PortConfig = model.PortConfig
 	state.Routes = model.Routes
@@ -965,36 +908,6 @@ func toSwitchPortSettingsModel(settings *oxide.SwitchPortSettings) (switchPortSe
 		model.BGPPeers = bgpPeersModels
 	}
 
-	//
-	// Groups
-	//
-	if len(settings.Groups) > 0 {
-		groupModels := make([]types.String, 0)
-		for _, group := range settings.Groups {
-			groupModel := types.StringValue(group.PortSettingsGroupId)
-			groupModels = append(groupModels, groupModel)
-		}
-		model.Groups = groupModels
-	}
-
-	//
-	// Interfaces
-	//
-	if len(settings.Interfaces) > 0 {
-		interfaceModels := make([]switchPortSettingsInterfaceModel, 0)
-		for _, iface := range settings.Interfaces {
-			interfaceModel := switchPortSettingsInterfaceModel{
-				Kind: &switchPortSettingsInterfaceKindModel{
-					Type: types.StringValue(string(iface.Kind)),
-				},
-				LinkName:  types.StringValue(string(iface.InterfaceName)),
-				V6Enabled: types.BoolPointerValue(iface.V6Enabled),
-			}
-			interfaceModels = append(interfaceModels, interfaceModel)
-		}
-		model.Interfaces = interfaceModels
-	}
-
 	//
 	// Links
 	//
@@ -1174,6 +1087,8 @@ func toNetworkingSwitchPortSettingsCreateParams(model switchPortSettingsModel) (
 			PortConfig: oxide.SwitchPortConfigCreate{
 				Geometry: oxide.SwitchPortGeometry(model.PortConfig.Geometry.ValueString()),
 			},
+			Groups:     []oxide.NameOrId{},
+			Interfaces: []oxide.SwitchInterfaceConfigCreate{},
 		},
 	}
 
@@ -1309,38 +1224,6 @@ func toNetworkingSwitchPortSettingsCreateParams(model switchPortSettingsModel) (
 	}
 	params.Body.BgpPeers = bgpPeerConfigs
 
-	//
-	// Groups
-	//
-	groups := make([]oxide.NameOrId, 0)
-	for _, group := range model.Groups {
-		groups = append(groups, oxide.NameOrId(group.ValueString()))
-	}
-	params.Body.Groups = groups
-
-	//
-	// Interfaces
-	//
-	interfaceConfigs := make([]oxide.SwitchInterfaceConfigCreate, 0)
-	for _, interfaceModel := range model.Interfaces {
-		interfaceConfig := oxide.SwitchInterfaceConfigCreate{
-			Kind: oxide.SwitchInterfaceKind{
-				Type: oxide.SwitchInterfaceKindType(interfaceModel.Kind.Type.ValueString()),
-				Vid: func() *int {
-					if interfaceModel.Kind.VID.IsNull() {
-						return nil
-					}
-					return oxide.NewPointer(int(interfaceModel.Kind.VID.ValueInt32()))
-				}(),
-			},
-			LinkName:  oxide.Name(interfaceModel.LinkName.ValueString()),
-			V6Enabled: oxide.NewPointer(interfaceModel.V6Enabled.ValueBool()),
-		}
-
-		interfaceConfigs = append(interfaceConfigs, interfaceConfig)
-	}
-	params.Body.Interfaces = interfaceConfigs
-
 	//
 	// Links
 	//

internal/provider/resource_switch_port_settings_test.go

@@ -68,16 +68,6 @@ resource "oxide_switch_port_settings" "{{.BlockName}}" {
     },
   ]
 
-  interfaces = [
-    {
-      link_name = "phy0"
-      kind = {
-        type = "primary"
-      }
-      v6_enabled = false
-    }
-  ]
-
   links = [
     {
       link_name = "phy0"
@@ -219,7 +209,6 @@ func checkResourceSwitchPortSettings(resourceName string, name string) resource.
 		resource.TestCheckResourceAttr(resourceName, "description", "Terraform acceptance testing."),
 		resource.TestCheckResourceAttr(resourceName, "port_config.geometry", "qsfp28x1"),
 		resource.TestCheckNoResourceAttr(resourceName, "bgp_peers"),
-		resource.TestCheckNoResourceAttr(resourceName, "groups"),
 		resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 		resource.TestCheckResourceAttrSet(resourceName, "time_modified"),
 
@@ -230,11 +219,6 @@ func checkResourceSwitchPortSettings(resourceName string, name string) resource.
 		resource.TestCheckResourceAttrSet(resourceName, "addresses.0.addresses.0.address_lot_id"),
 		resource.TestCheckNoResourceAttr(resourceName, "addresses.0.addresses.0.vlan_id"),
 
-		resource.TestCheckResourceAttr(resourceName, "interfaces.#", "1"),
-		resource.TestCheckResourceAttr(resourceName, "interfaces.0.link_name", "phy0"),
-		resource.TestCheckResourceAttr(resourceName, "interfaces.0.kind.type", "primary"),
-		resource.TestCheckResourceAttr(resourceName, "interfaces.0.v6_enabled", "false"),
-
 		resource.TestCheckResourceAttr(resourceName, "links.#", "1"),
 		resource.TestCheckResourceAttr(resourceName, "links.0.link_name", "phy0"),
 		resource.TestCheckResourceAttr(resourceName, "links.0.autoneg", "false"),
@@ -267,8 +251,6 @@ func checkResourceSwitchPortSettingsUpdate(resourceName string, name string) res
 		resource.TestCheckResourceAttr(resourceName, "description", "Terraform acceptance testing (updated)."),
 		resource.TestCheckResourceAttr(resourceName, "port_config.geometry", "qsfp28x1"),
 		resource.TestCheckNoResourceAttr(resourceName, "bgp_peers"),
-		resource.TestCheckNoResourceAttr(resourceName, "groups"),
-		resource.TestCheckNoResourceAttr(resourceName, "interfaces"),
 		resource.TestCheckResourceAttrSet(resourceName, "time_created"),
 		resource.TestCheckResourceAttrSet(resourceName, "time_modified"),