Skip to content

Commit 8966e69

Browse files
author
Roman
committed
fix vlan string type
1 parent 04b8094 commit 8966e69

2 files changed

Lines changed: 12 additions & 14 deletions

File tree

selectel/data_source_selectel_dedicated_private_subnet_v1.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ func dataSourceDedicatedPrivateSubnetV1() *schema.Resource {
4242
ValidateFunc: validation.IsCIDR,
4343
},
4444
"vlan": {
45-
Type: schema.TypeInt,
46-
Optional: true,
47-
ValidateFunc: validation.IntBetween(1, 3499),
45+
Type: schema.TypeString,
46+
Optional: true,
4847
},
4948
},
5049
},
@@ -91,7 +90,7 @@ func dataSourceDedicatedPrivateSubnetV1Read(ctx context.Context, d *schema.Resou
9190

9291
var allSubnets dedicated.Subnets
9392

94-
nets, _, err := dsClient.Networks(ctx, filter.locationID, dedicated.NetworkTypeLocal, strconv.Itoa(filter.vlan))
93+
nets, _, err := dsClient.Networks(ctx, filter.locationID, dedicated.NetworkTypeLocal, filter.vlan)
9594
if err != nil {
9695
return diag.FromErr(errGettingObjects(objectNetwork, err))
9796
}
@@ -141,7 +140,7 @@ type dedicatedPrivateSubnetsSearchFilter struct {
141140
locationID string
142141
ip string
143142
subnet string
144-
vlan int
143+
vlan string
145144
}
146145

147146
func expandDedicatedPrivateSubnetsSearchFilter(d *schema.ResourceData) dedicatedPrivateSubnetsSearchFilter {
@@ -175,7 +174,7 @@ func expandDedicatedPrivateSubnetsSearchFilter(d *schema.ResourceData) dedicated
175174

176175
vlan, ok := resourceFilterMap["vlan"]
177176
if ok {
178-
filter.vlan = vlan.(int)
177+
filter.vlan = vlan.(string)
179178
}
180179

181180
return filter

selectel/resource_selectel_dedicated_private_subnet_v1.go

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,10 @@ func resourceDedicatedPrivateSubnetV1() *schema.Resource {
3737
ValidateFunc: validation.IsUUID,
3838
},
3939
"vlan": {
40-
Type: schema.TypeInt,
41-
Required: true,
42-
ForceNew: true,
43-
Description: "VLAN TAG for the private subnet",
44-
ValidateFunc: validation.IntBetween(1, 3499),
40+
Type: schema.TypeString,
41+
Required: true,
42+
ForceNew: true,
43+
Description: "VLAN TAG for the private subnet",
4544
},
4645
"subnet": {
4746
Type: schema.TypeString,
@@ -61,7 +60,7 @@ func resourceDedicatedPrivateSubnetV1Create(ctx context.Context, d *schema.Resou
6160
}
6261

6362
locationID := d.Get("location_id").(string)
64-
vlan := d.Get("vlan").(int)
63+
vlan := d.Get("vlan").(string)
6564
subnetCIDR := d.Get("subnet").(string)
6665

6766
// Validate private subnet
@@ -70,12 +69,12 @@ func resourceDedicatedPrivateSubnetV1Create(ctx context.Context, d *schema.Resou
7069
return diag.FromErr(err)
7170
}
7271

73-
networks, _, err := client.Networks(ctx, locationID, dedicated.NetworkTypeLocal, strconv.Itoa(vlan))
72+
networks, _, err := client.Networks(ctx, locationID, dedicated.NetworkTypeLocal, vlan)
7473
if err != nil {
7574
return diag.Errorf("failed to get networks for location %s: %s", locationID, err)
7675
}
7776
if len(networks) == 0 {
78-
return diag.Errorf("vlan %d not found in location %s", vlan, locationID)
77+
return diag.Errorf("vlan %s not found in location %s", vlan, locationID)
7978
}
8079

8180
localSubnet, _, err := client.CreateNetworkLocalSubnet(ctx, networks[0].UUID, subnetCIDR)

0 commit comments

Comments
 (0)