refactor: move data.hcloud_server_type(s) to Plugin Framework

hetznercloud · Sep 10, 2024 · 79a9d03 · 79a9d03
1 parent 3da0a47
commit 79a9d03
Show file tree

Hide file tree

Showing 7 changed files with 412 additions and 164 deletions.
diff --git a/hcloud/plugin_provider.go b/hcloud/plugin_provider.go
@@ -20,6 +20,7 @@ import (
 	"github.com/hetznercloud/hcloud-go/hcloud"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/datacenter"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/location"
+	"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/sshkey"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/util/tflogutil"
 )
@@ -172,6 +173,8 @@ func (p *PluginProvider) DataSources(_ context.Context) []func() datasource.Data
 		datacenter.NewDataSourceList,
 		location.NewDataSource,
 		location.NewDataSourceList,
+		servertype.NewDataSource,
+		servertype.NewDataSourceList,
 		sshkey.NewDataSource,
 		sshkey.NewDataSourceList,
 	}

diff --git a/hcloud/provider.go b/hcloud/provider.go
@@ -27,7 +27,6 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/network"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/rdns"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/server"
-	"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/volume"
 )
 
@@ -118,8 +117,6 @@ func Provider() *schema.Provider {
 			placementgroup.DataSourceListType: placementgroup.DataSourceList(),
 			server.DataSourceType:             server.DataSource(),
 			server.DataSourceListType:         server.DataSourceList(),
-			servertype.DataSourceType:         servertype.DataSource(),
-			servertype.DataSourceListType:     servertype.ServerTypesDataSource(),
 			volume.DataSourceType:             volume.DataSource(),
 			volume.DataSourceListType:         volume.DataSourceList(),
 		},

diff --git a/hcloud/provider_test.go b/hcloud/provider_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/primaryip"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/rdns"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/server"
-	"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/snapshot"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/volume"
 	"github.com/stretchr/testify/assert"
@@ -81,8 +80,6 @@ func TestProvider_DataSources(t *testing.T) {
 		placementgroup.DataSourceListType,
 		server.DataSourceType,
 		server.DataSourceListType,
-		servertype.DataSourceType,
-		servertype.DataSourceListType,
 		volume.DataSourceType,
 		volume.DataSourceListType,
 	}