Skip to content

Commit cb246e7

Browse files
authored
Bump SDK version to c8be658 (#410)
Depends on oxidecomputer/oxide.go#274 Closes: #403
1 parent ce6ac4c commit cb246e7

10 files changed

+26
-24
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/hashicorp/terraform-plugin-log v0.9.0
1212
github.com/hashicorp/terraform-plugin-sdk/v2 v2.36.1
1313
github.com/hashicorp/terraform-plugin-testing v1.12.0
14-
github.com/oxidecomputer/oxide.go v0.3.0
14+
github.com/oxidecomputer/oxide.go v0.3.1-0.20250328231836-c8be65844352
1515
github.com/stretchr/testify v1.10.0
1616
)
1717

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
136136
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
137137
github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
138138
github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
139-
github.com/oxidecomputer/oxide.go v0.3.0 h1:I5l9njXo1lp1Tqp63y8HKw19HOpuEV8RRkJqpXoxcdQ=
140-
github.com/oxidecomputer/oxide.go v0.3.0/go.mod h1:FECb3qr0RSxGnHIiH6DsUGdkTcY/WeKN1evZCTQ3fy4=
139+
github.com/oxidecomputer/oxide.go v0.3.1-0.20250328231836-c8be65844352 h1:C7+yo9PnkjVkS4UvhX0gMUQhzaBbS5L8WTsEraSdgyM=
140+
github.com/oxidecomputer/oxide.go v0.3.1-0.20250328231836-c8be65844352/go.mod h1:yNLdQdroM42/yDIFlCsLAR9PawAdeJZDgHdAx+wcywg=
141141
github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
142142
github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
143143
github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=

internal/provider/data_source_images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func (d *imagesDataSource) Read(ctx context.Context, req datasource.ReadRequest,
164164
// Seems unlikely anyone will have more than one billion images.
165165
params := oxide.ImageListParams{
166166
Project: oxide.NameOrId(state.ProjectID.ValueString()),
167-
Limit: 1000000000,
167+
Limit: oxide.NewPointer(1000000000),
168168
SortBy: oxide.NameOrIdSortModeIdAscending,
169169
}
170170
images, err := d.client.ImageList(ctx, params)

internal/provider/data_source_projects.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (d *projectsDataSource) Read(ctx context.Context, req datasource.ReadReques
115115
// as there are in reality. For now I'll use the List method with a limit of 1,000,000,000 results.
116116
// Seems unlikely anyone will have more than one billion projects.
117117
params := oxide.ProjectListParams{
118-
Limit: 1000000000,
118+
Limit: oxide.NewPointer(1000000000),
119119
SortBy: oxide.NameOrIdSortModeNameDescending,
120120
}
121121
projects, err := d.client.ProjectList(ctx, params)

internal/provider/resource_instance.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ func newAttachedDisksSet(ctx context.Context, client *oxide.Client, instanceID s
821821
var diags diag.Diagnostics
822822

823823
params := oxide.InstanceDiskListParams{
824-
Limit: 1000000000,
824+
Limit: oxide.NewPointer(1000000000),
825825
Instance: oxide.NameOrId(instanceID),
826826
}
827827
disks, err := client.InstanceDiskList(ctx, params)
@@ -851,7 +851,7 @@ func newAssociatedSSHKeysOnCreateSet(ctx context.Context, client *oxide.Client,
851851
var diags diag.Diagnostics
852852

853853
params := oxide.InstanceSshPublicKeyListParams{
854-
Limit: 1000000000,
854+
Limit: oxide.NewPointer(1000000000),
855855
Instance: oxide.NameOrId(instanceID),
856856
}
857857
keys, err := client.InstanceSshPublicKeyList(ctx, params)
@@ -919,7 +919,7 @@ func newAttachedNetworkInterfacesModel(ctx context.Context, client *oxide.Client
919919

920920
params := oxide.InstanceNetworkInterfaceListParams{
921921
Instance: oxide.NameOrId(instanceID),
922-
Limit: 1000000000,
922+
Limit: oxide.NewPointer(1000000000),
923923
}
924924
nics, err := client.InstanceNetworkInterfaceList(ctx, params)
925925
if err != nil {

internal/provider/resource_ip_pool.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ func (r *ipPoolResource) Read(ctx context.Context, req resource.ReadRequest, res
208208
// Append information about IP Pool ranges
209209
listParams := oxide.IpPoolRangeListParams{
210210
Pool: oxide.NameOrId(ipPool.Id),
211-
Limit: 1000000000,
211+
Limit: oxide.NewPointer(1000000000),
212212
}
213213
ipPoolRanges, err := r.client.IpPoolRangeList(ctx, listParams)
214214
if err != nil {
@@ -355,7 +355,7 @@ func (r *ipPoolResource) Delete(ctx context.Context, req resource.DeleteRequest,
355355
ctx,
356356
oxide.IpPoolRangeListParams{
357357
Pool: oxide.NameOrId(state.ID.ValueString()),
358-
Limit: 1000000000,
358+
Limit: oxide.NewPointer(1000000000),
359359
},
360360
)
361361
if err != nil {

internal/provider/resource_ip_pool_silo_link.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ func (r *ipPoolSiloLinkResource) Read(ctx context.Context, req resource.ReadRequ
168168

169169
params := oxide.IpPoolSiloListParams{
170170
Pool: oxide.NameOrId(state.IPPoolID.ValueString()),
171-
Limit: 1000000000,
171+
Limit: oxide.NewPointer(1000000000),
172172
SortBy: oxide.IdSortModeIdAscending,
173173
}
174174

internal/provider/resource_ip_pool_silo_link_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ func testAccIPPoolSiloLinkDestroy(s *terraform.State) error {
195195
siloID := rs.Primary.Attributes["silo_id"]
196196
params := oxide.IpPoolSiloListParams{
197197
Pool: oxide.NameOrId(oxide.NameOrId(ipPoolID)),
198-
Limit: 1000000000,
198+
Limit: oxide.NewPointer(1000000000),
199199
SortBy: oxide.IdSortModeIdAscending,
200200
}
201201

internal/provider/resource_vpc_firewall_rules.go

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -509,10 +509,11 @@ func newVPCFirewallRulesUpdateBody(rules []vpcFirewallRulesResourceRuleModel) *o
509509
Description: rule.Description.ValueString(),
510510
Direction: oxide.VpcFirewallRuleDirection(rule.Direction.ValueString()),
511511
Name: oxide.Name(rule.Name.ValueString()),
512-
Priority: int(rule.Priority.ValueInt64()),
513-
Status: oxide.VpcFirewallRuleStatus(rule.Status.ValueString()),
514-
Filters: newFilterTypeFromModel(rule.Filters),
515-
Targets: newTargetTypeFromModel(rule.Targets),
512+
// We can safely dereference rule.Priority as it's a required field
513+
Priority: oxide.NewPointer(int(*rule.Priority.ValueInt64Pointer())),
514+
Status: oxide.VpcFirewallRuleStatus(rule.Status.ValueString()),
515+
Filters: newFilterTypeFromModel(rule.Filters),
516+
Targets: newTargetTypeFromModel(rule.Targets),
516517
}
517518

518519
updateRules = append(updateRules, r)
@@ -527,12 +528,13 @@ func newVPCFirewallRulesModel(rules []oxide.VpcFirewallRule) ([]vpcFirewallRules
527528

528529
for _, rule := range rules {
529530
m := vpcFirewallRulesResourceRuleModel{
530-
Action: types.StringValue(string(rule.Action)),
531-
Description: types.StringValue(rule.Description),
532-
Direction: types.StringValue(string(rule.Direction)),
533-
ID: types.StringValue(rule.Id),
534-
Name: types.StringValue(string(rule.Name)),
535-
Priority: types.Int64Value(int64(rule.Priority)),
531+
Action: types.StringValue(string(rule.Action)),
532+
Description: types.StringValue(rule.Description),
533+
Direction: types.StringValue(string(rule.Direction)),
534+
ID: types.StringValue(rule.Id),
535+
Name: types.StringValue(string(rule.Name)),
536+
// We can safely dereference rule.Priority as it's a required field
537+
Priority: types.Int64Value(int64(*rule.Priority)),
536538
Status: types.StringValue(string(rule.Status)),
537539
Targets: newTargetsModelFromResponse(rule.Targets),
538540
TimeCreated: types.StringValue(rule.TimeCreated.String()),

internal/provider/resource_vpc_firewall_rules_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ resource "oxide_vpc_firewall_rules" "{{.BlockName}}" {
113113
description = "custom deny"
114114
name = "custom-deny-http"
115115
direction = "inbound"
116-
priority = 50
116+
priority = 0
117117
status = "enabled"
118118
filters = {
119119
ports = ["8123"]
@@ -290,7 +290,7 @@ func checkResourceFirewallRulesUpdate(resourceName string) resource.TestCheckFun
290290
resource.TestCheckResourceAttr(resourceName, "rules.0.filters.protocols.0", "ICMP"),
291291
resource.TestCheckResourceAttrSet(resourceName, "rules.0.id"),
292292
resource.TestCheckResourceAttr(resourceName, "rules.0.name", "custom-deny-http"),
293-
resource.TestCheckResourceAttr(resourceName, "rules.0.priority", "50"),
293+
resource.TestCheckResourceAttr(resourceName, "rules.0.priority", "0"),
294294
resource.TestCheckResourceAttr(resourceName, "rules.0.status", "enabled"),
295295
resource.TestCheckResourceAttr(resourceName, "rules.0.targets.0.type", "subnet"),
296296
resource.TestCheckResourceAttr(resourceName, "rules.0.targets.0.value", "default"),

0 commit comments

Comments
 (0)