Skip to content

Commit 27ff85c

Browse files
MacherelRMacherelR
committed
fix: Refactored to fix linter warnings and formatting
1 parent c5e365f commit 27ff85c

20 files changed

+308
-154
lines changed

‎example/resource_virtual_environment_vm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
locals {
2-
datastore_id = "local-lvm"
2+
datastore_id = var.virtual_environment_storage
33
}
44

55
resource "proxmox_virtual_environment_vm" "example_template" {

‎examples/guides/clone-vm/clone.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
resource "proxmox_virtual_environment_vm" "ubuntu_clone" {
22
name = "ubuntu-clone"
3-
node_name = var.virtual_environment_node_name
3+
node_name = "pve"
44

55
clone {
66
vm_id = proxmox_virtual_environment_vm.ubuntu_template.id

‎fwprovider/cluster/sdn/datasource_sdn_subnets.go

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ import (
1313
"github.com/bpg/terraform-provider-proxmox/proxmox/cluster/sdn/subnets"
1414
)
1515

16-
var (
17-
_ datasource.DataSource = &sdnSubnetDataSource{}
18-
_ datasource.DataSourceWithConfigure = &sdnSubnetDataSource{}
19-
)
16+
var _ datasource.DataSource = &sdnSubnetDataSource{}
17+
18+
var _ datasource.DataSourceWithConfigure = &sdnSubnetDataSource{}
2019

2120
type sdnSubnetDataSource struct {
2221
client *subnets.Client
@@ -26,11 +25,19 @@ func NewSDNSubnetDataSource() datasource.DataSource {
2625
return &sdnSubnetDataSource{}
2726
}
2827

29-
func (d *sdnSubnetDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
28+
func (d *sdnSubnetDataSource) Metadata(
29+
ctx context.Context,
30+
req datasource.MetadataRequest,
31+
resp *datasource.MetadataResponse,
32+
) {
3033
resp.TypeName = req.ProviderTypeName + "_sdn_subnet"
3134
}
3235

33-
func (d *sdnSubnetDataSource) Configure(ctx context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
36+
func (d *sdnSubnetDataSource) Configure(
37+
ctx context.Context,
38+
req datasource.ConfigureRequest,
39+
resp *datasource.ConfigureResponse,
40+
) {
3441
if req.ProviderData == nil {
3542
return
3643
}
@@ -41,13 +48,18 @@ func (d *sdnSubnetDataSource) Configure(ctx context.Context, req datasource.Conf
4148
"Unexpected Provider Configuration",
4249
fmt.Sprintf("Expected config.DataSource, got: %T", req.ProviderData),
4350
)
51+
4452
return
4553
}
4654

4755
d.client = cfg.Client.Cluster().SDNSubnets()
4856
}
4957

50-
func (d *sdnSubnetDataSource) Schema(ctx context.Context, req datasource.SchemaRequest, resp *datasource.SchemaResponse) {
58+
func (d *sdnSubnetDataSource) Schema(
59+
ctx context.Context,
60+
req datasource.SchemaRequest,
61+
resp *datasource.SchemaResponse,
62+
) {
5163
resp.Schema = schema.Schema{
5264
Description: "Retrieve details about a specific SDN Subnet in Proxmox VE.",
5365
Attributes: map[string]schema.Attribute{
@@ -109,6 +121,7 @@ func (d *sdnSubnetDataSource) Read(ctx context.Context, req datasource.ReadReque
109121
var config sdnSubnetModel
110122

111123
resp.Diagnostics.Append(req.Config.Get(ctx, &config)...)
124+
112125
if resp.Diagnostics.HasError() {
113126
return
114127
}
@@ -119,17 +132,19 @@ func (d *sdnSubnetDataSource) Read(ctx context.Context, req datasource.ReadReque
119132
resp.Diagnostics.AddError("Subnet not found", err.Error())
120133
return
121134
}
135+
122136
resp.Diagnostics.AddError("Failed to retrieve subnet", err.Error())
137+
123138
return
124139
}
125140

126-
// Set the state
141+
// Set the state.
127142
state := &sdnSubnetModel{}
128143
state.Subnet = config.Subnet
129144
state.Vnet = config.Vnet
130145
state.importFromAPI(config.Subnet.ValueString(), subnet)
131146

132-
// Set canonical name and ID (both = user-supplied subnet)
147+
// Set canonical name and ID (both = user-supplied subnet).
133148
state.ID = config.Subnet
134149
state.CanonicalName = config.Subnet
135150

‎fwprovider/cluster/sdn/datasource_sdn_vnets.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ import (
1414
"github.com/bpg/terraform-provider-proxmox/proxmox/cluster/sdn/vnets"
1515
)
1616

17-
var (
18-
_ datasource.DataSource = &sdnVnetDataSource{}
19-
_ datasource.DataSourceWithConfigure = &sdnVnetDataSource{}
20-
)
17+
var _ datasource.DataSource = &sdnVnetDataSource{}
18+
19+
var _ datasource.DataSourceWithConfigure = &sdnVnetDataSource{}
2120

2221
type sdnVnetDataSource struct {
2322
client *vnets.Client
@@ -27,11 +26,19 @@ func NewSDNVnetDataSource() datasource.DataSource {
2726
return &sdnVnetDataSource{}
2827
}
2928

30-
func (d *sdnVnetDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
29+
func (d *sdnVnetDataSource) Metadata(
30+
ctx context.Context,
31+
req datasource.MetadataRequest,
32+
resp *datasource.MetadataResponse,
33+
) {
3134
resp.TypeName = req.ProviderTypeName + "_sdn_vnet"
3235
}
3336

34-
func (d *sdnVnetDataSource) Configure(ctx context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
37+
func (d *sdnVnetDataSource) Configure(
38+
ctx context.Context,
39+
req datasource.ConfigureRequest,
40+
resp *datasource.ConfigureResponse,
41+
) {
3542
if req.ProviderData == nil {
3643
return
3744
}
@@ -42,6 +49,7 @@ func (d *sdnVnetDataSource) Configure(ctx context.Context, req datasource.Config
4249
"Unexpected Provider Data",
4350
fmt.Sprintf("Expected config.DataSource, got: %T", req.ProviderData),
4451
)
52+
4553
return
4654
}
4755

@@ -96,18 +104,22 @@ func (d *sdnVnetDataSource) Read(ctx context.Context, req datasource.ReadRequest
96104
var config sdnVnetModel
97105

98106
resp.Diagnostics.Append(req.Config.Get(ctx, &config)...)
107+
99108
if resp.Diagnostics.HasError() {
100109
return
101110
}
102111

103112
vnetID := config.Name.ValueString()
113+
104114
vnet, err := d.client.GetVnet(ctx, vnetID)
105115
if err != nil {
106116
if errors.Is(err, api.ErrResourceDoesNotExist) {
107117
resp.Diagnostics.AddError("Vnet not found", fmt.Sprintf("No vnet with ID %q exists", vnetID))
108118
return
109119
}
120+
110121
resp.Diagnostics.AddError("Error retrieving vnet", err.Error())
122+
111123
return
112124
}
113125

‎fwprovider/cluster/sdn/datasource_sdn_zones.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import (
1212
)
1313

1414
var _ datasource.DataSource = &sdnZoneDataSource{}
15+
1516
var _ datasource.DataSourceWithConfigure = &sdnZoneDataSource{}
1617

1718
type sdnZoneDataSource struct {
@@ -22,11 +23,19 @@ func NewSDNZoneDataSource() datasource.DataSource {
2223
return &sdnZoneDataSource{}
2324
}
2425

25-
func (d *sdnZoneDataSource) Metadata(_ context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
26+
func (d *sdnZoneDataSource) Metadata(
27+
_ context.Context,
28+
req datasource.MetadataRequest,
29+
resp *datasource.MetadataResponse,
30+
) {
2631
resp.TypeName = req.ProviderTypeName + "_sdn_zone"
2732
}
2833

29-
func (d *sdnZoneDataSource) Configure(_ context.Context, req datasource.ConfigureRequest, resp *datasource.ConfigureResponse) {
34+
func (d *sdnZoneDataSource) Configure(
35+
_ context.Context,
36+
req datasource.ConfigureRequest,
37+
resp *datasource.ConfigureResponse,
38+
) {
3039
if req.ProviderData == nil {
3140
return
3241
}
@@ -37,6 +46,7 @@ func (d *sdnZoneDataSource) Configure(_ context.Context, req datasource.Configur
3746
"Unexpected Provider Configuration",
3847
fmt.Sprintf("Expected config.DataSource but got: %T", req.ProviderData),
3948
)
49+
4050
return
4151
}
4252

@@ -82,6 +92,7 @@ func (d *sdnZoneDataSource) Read(ctx context.Context, req datasource.ReadRequest
8292
var data sdnZoneModel
8393

8494
resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
95+
8596
if resp.Diagnostics.HasError() {
8697
return
8798
}

0 commit comments

Comments
 (0)