mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-06-30 18:42:58 +00:00
Code

misc(code): move fwprovider files around (#1866)

Browse Source 
Signed-off-by: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
This commit is contained in:
Pavel Boldyrev 2025-03-29 15:02:41 -04:00 committed by GitHub
parent 7090b1036a
commit 2a356014a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
60 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
fwprovider/acme/datasource_acme_account.go → fwprovider/cluster/acme/datasource_acme_account.go
View File

0
fwprovider/acme/datasource_acme_accounts.go → fwprovider/cluster/acme/datasource_acme_accounts.go
View File

0
fwprovider/acme/datasource_acme_plugin.go → fwprovider/cluster/acme/datasource_acme_plugin.go
View File

0
fwprovider/acme/datasource_acme_plugins.go → fwprovider/cluster/acme/datasource_acme_plugins.go
View File

0
fwprovider/acme/plugin_model.go → fwprovider/cluster/acme/plugin_model.go
View File

0
fwprovider/acme/resource_acme_account.go → fwprovider/cluster/acme/resource_acme_account.go
View File

0
fwprovider/acme/resource_acme_dns_plugin.go → fwprovider/cluster/acme/resource_acme_dns_plugin.go
View File

0
fwprovider/ha/datasource_hagroup.go → fwprovider/cluster/ha/datasource_hagroup.go
View File

0
fwprovider/ha/datasource_hagroups.go → fwprovider/cluster/ha/datasource_hagroups.go
View File

0
fwprovider/ha/datasource_haresource.go → fwprovider/cluster/ha/datasource_haresource.go
View File

0
fwprovider/ha/datasource_haresources.go → fwprovider/cluster/ha/datasource_haresources.go
View File

0
fwprovider/ha/hagroup_model.go → fwprovider/cluster/ha/hagroup_model.go
View File

0
fwprovider/ha/haresource_model.go → fwprovider/cluster/ha/haresource_model.go
View File

0
fwprovider/ha/resource_hagroup.go → fwprovider/cluster/ha/resource_hagroup.go
View File

0
fwprovider/ha/resource_haresource.go → fwprovider/cluster/ha/resource_haresource.go
View File

0
fwprovider/ha/validators.go → fwprovider/cluster/ha/validators.go
View File

2
fwprovider/resource_options.go → fwprovider/cluster/options/resource_options.go
View File

@ -4,7 +4,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package fwprovider
package options
import (
"context"

2
fwprovider/resource_options_test.go → fwprovider/cluster/options/resource_options_test.go
View File

@ -6,7 +6,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package fwprovider_test
package options_test
import (
"fmt"

0
fwprovider/hardwaremapping/datasource.go → fwprovider/nodes/hardwaremapping/datasource.go
View File

0
fwprovider/hardwaremapping/datasource_pci.go → fwprovider/nodes/hardwaremapping/datasource_pci.go
View File

0
fwprovider/hardwaremapping/datasource_usb.go → fwprovider/nodes/hardwaremapping/datasource_usb.go
View File

0
fwprovider/hardwaremapping/errors.go → fwprovider/nodes/hardwaremapping/errors.go
View File

0
fwprovider/hardwaremapping/models.go → fwprovider/nodes/hardwaremapping/models.go
View File

0
fwprovider/hardwaremapping/resource_hardware_mapping_test.go → fwprovider/nodes/hardwaremapping/resource_hardware_mapping_test.go
View File

0
fwprovider/hardwaremapping/resource_pci.go → fwprovider/nodes/hardwaremapping/resource_pci.go
View File

0
fwprovider/hardwaremapping/resource_usb.go → fwprovider/nodes/hardwaremapping/resource_usb.go
View File

0
fwprovider/hardwaremapping/shared.go → fwprovider/nodes/hardwaremapping/shared.go
View File

0
fwprovider/network/resource_linux_bridge.go → fwprovider/nodes/network/resource_linux_bridge.go
View File

0
fwprovider/network/resource_linux_bridge_test.go → fwprovider/nodes/network/resource_linux_bridge_test.go
View File

0
fwprovider/network/resource_linux_vlan.go → fwprovider/nodes/network/resource_linux_vlan.go
View File

0
fwprovider/network/resource_linux_vlan_test.go → fwprovider/nodes/network/resource_linux_vlan_test.go
View File

2
fwprovider/resource_download_file.go → fwprovider/nodes/resource_download_file.go
View File

@ -4,7 +4,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package fwprovider
package nodes
import (
"context"

2
fwprovider/resource_download_file_test.go → fwprovider/nodes/resource_download_file_test.go
View File

@ -6,7 +6,7 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
*/
package fwprovider_test
package nodes_test
import (
"context"

0
fwprovider/vm/cdrom/model.go → fwprovider/nodes/vm/cdrom/model.go
View File

0
fwprovider/vm/cdrom/resource.go → fwprovider/nodes/vm/cdrom/resource.go
View File

0
fwprovider/vm/cdrom/resource_schema.go → fwprovider/nodes/vm/cdrom/resource_schema.go
View File

0
fwprovider/vm/cdrom/resource_test.go → fwprovider/nodes/vm/cdrom/resource_test.go
View File

0
fwprovider/vm/concurrency_test.go → fwprovider/nodes/vm/concurrency_test.go
View File

0
fwprovider/vm/cpu/datasource_schema.go → fwprovider/nodes/vm/cpu/datasource_schema.go
View File

0
fwprovider/vm/cpu/model.go → fwprovider/nodes/vm/cpu/model.go
View File

0
fwprovider/vm/cpu/resource.go → fwprovider/nodes/vm/cpu/resource.go
View File

0
fwprovider/vm/cpu/resource_schema.go → fwprovider/nodes/vm/cpu/resource_schema.go
View File

0
fwprovider/vm/cpu/resource_test.go → fwprovider/nodes/vm/cpu/resource_test.go
View File

0
fwprovider/vm/datasource.go → fwprovider/nodes/vm/datasource.go
View File

6
fwprovider/vm/datasource_schema.go → fwprovider/nodes/vm/datasource_schema.go
View File

@ -13,10 +13,10 @@ import (
"github.com/hashicorp/terraform-plugin-framework/datasource"
"github.com/hashicorp/terraform-plugin-framework/datasource/schema"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/vga"
"github.com/bpg/terraform-provider-proxmox/fwprovider/types/stringset"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/vga"
)
// Schema defines the schema for the resource.

8
fwprovider/vm/model.go → fwprovider/nodes/vm/model.go
View File

@ -15,11 +15,11 @@ import (
"github.com/hashicorp/terraform-plugin-framework/types"
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/vga"
"github.com/bpg/terraform-provider-proxmox/fwprovider/types/stringset"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/vga"
"github.com/bpg/terraform-provider-proxmox/proxmox"
"github.com/bpg/terraform-provider-proxmox/proxmox/api"
)

8
fwprovider/vm/resource.go → fwprovider/nodes/vm/resource.go
View File

@ -22,10 +22,10 @@ import (
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/bpg/terraform-provider-proxmox/fwprovider/config"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/vga"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/vga"
"github.com/bpg/terraform-provider-proxmox/proxmox"
"github.com/bpg/terraform-provider-proxmox/proxmox/api"
"github.com/bpg/terraform-provider-proxmox/proxmox/cluster"

8
fwprovider/vm/resource_schema.go → fwprovider/nodes/vm/resource_schema.go
View File

@ -22,11 +22,11 @@ import (
"github.com/hashicorp/terraform-plugin-framework/resource/schema/planmodifier"
"github.com/hashicorp/terraform-plugin-framework/schema/validator"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm/vga"
"github.com/bpg/terraform-provider-proxmox/fwprovider/types/stringset"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cdrom"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/cpu"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/rng"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm/vga"
)
// Schema defines the schema for the resource.

0
fwprovider/vm/resource_test.go → fwprovider/nodes/vm/resource_test.go
View File

0
fwprovider/vm/rng/datasource_schema.go → fwprovider/nodes/vm/rng/datasource_schema.go
View File

0
fwprovider/vm/rng/model.go → fwprovider/nodes/vm/rng/model.go
View File

0
fwprovider/vm/rng/resource.go → fwprovider/nodes/vm/rng/resource.go
View File

0
fwprovider/vm/rng/resource_schema.go → fwprovider/nodes/vm/rng/resource_schema.go
View File

0
fwprovider/vm/rng/resource_test.go → fwprovider/nodes/vm/rng/resource_test.go
View File

0
fwprovider/vm/vga/datasource_schema.go → fwprovider/nodes/vm/vga/datasource_schema.go
View File

0
fwprovider/vm/vga/model.go → fwprovider/nodes/vm/vga/model.go
View File

0
fwprovider/vm/vga/resource.go → fwprovider/nodes/vm/vga/resource.go
View File

0
fwprovider/vm/vga/resource_schema.go → fwprovider/nodes/vm/vga/resource_schema.go
View File

0
fwprovider/vm/vga/resource_test.go → fwprovider/nodes/vm/vga/resource_test.go
View File

32
fwprovider/provider.go
View File

@ -25,18 +25,20 @@ import (
"github.com/hashicorp/terraform-plugin-log/tflog"
"github.com/bpg/terraform-provider-proxmox/fwprovider/access"
"github.com/bpg/terraform-provider-proxmox/fwprovider/acme"
"github.com/bpg/terraform-provider-proxmox/fwprovider/cluster/acme"
"github.com/bpg/terraform-provider-proxmox/fwprovider/cluster/ha"
"github.com/bpg/terraform-provider-proxmox/fwprovider/cluster/metrics"
"github.com/bpg/terraform-provider-proxmox/fwprovider/cluster/options"
"github.com/bpg/terraform-provider-proxmox/fwprovider/config"
"github.com/bpg/terraform-provider-proxmox/fwprovider/ha"
"github.com/bpg/terraform-provider-proxmox/fwprovider/hardwaremapping"
"github.com/bpg/terraform-provider-proxmox/fwprovider/network"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/apt"
"github.com/bpg/terraform-provider-proxmox/fwprovider/vm"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/hardwaremapping"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/network"
"github.com/bpg/terraform-provider-proxmox/fwprovider/nodes/vm"
"github.com/bpg/terraform-provider-proxmox/proxmox"
"github.com/bpg/terraform-provider-proxmox/proxmox/api"
"github.com/bpg/terraform-provider-proxmox/proxmox/cluster"
"github.com/bpg/terraform-provider-proxmox/proxmox/nodes"
proxmoxnodes "github.com/bpg/terraform-provider-proxmox/proxmox/nodes"
"github.com/bpg/terraform-provider-proxmox/proxmox/ssh"
"github.com/bpg/terraform-provider-proxmox/utils"
)
@ -495,32 +497,32 @@ func (p *proxmoxProvider) Configure(
func (p *proxmoxProvider) Resources(_ context.Context) []func() resource.Resource {
return []func() resource.Resource{
NewClusterOptionsResource,
NewDownloadFileResource,
access.NewACLResource,
access.NewUserTokenResource,
acme.NewACMEAccountResource,
acme.NewACMEPluginResource,
apt.NewRepositoryResource,
apt.NewStandardRepositoryResource,
access.NewACLResource,
access.NewUserTokenResource,
ha.NewHAGroupResource,
ha.NewHAResourceResource,
hardwaremapping.NewPCIResource,
hardwaremapping.NewUSBResource,
metrics.NewMetricsServerResource,
network.NewLinuxBridgeResource,
network.NewLinuxVLANResource,
nodes.NewDownloadFileResource,
options.NewClusterOptionsResource,
vm.NewResource,
metrics.NewMetricsServerResource,
}
}
func (p *proxmoxProvider) DataSources(_ context.Context) []func() datasource.DataSource {
return []func() datasource.DataSource{
NewVersionDataSource,
acme.NewACMEAccountsDataSource,
acme.NewACMEAccountDataSource,
acme.NewACMEPluginsDataSource,
acme.NewACMEAccountsDataSource,
acme.NewACMEPluginDataSource,
acme.NewACMEPluginsDataSource,
apt.NewRepositoryDataSource,
apt.NewStandardRepositoryDataSource,
ha.NewHAGroupDataSource,
@ -530,8 +532,8 @@ func (p *proxmoxProvider) DataSources(_ context.Context) []func() datasource.Dat
hardwaremapping.NewDataSource,
hardwaremapping.NewPCIDataSource,
hardwaremapping.NewUSBDataSource,
vm.NewDataSource,
metrics.NewMetricsServerDatasource,
vm.NewDataSource,
}
}
@ -540,7 +542,7 @@ type apiResolver struct {
}
func (r *apiResolver) Resolve(ctx context.Context, nodeName string) (ssh.ProxmoxNode, error) {
nc := &nodes.Client{Client: r.c, NodeName: nodeName}
nc := &proxmoxnodes.Client{Client: r.c, NodeName: nodeName}
networkDevices, err := nc.ListNetworkInterfaces(ctx)
if err != nil {