Skip to content

Commit 56e3ba7

Browse files
committed
refactor: move data.hcloud_server_type(s) to Plugin Framework
1 parent 9fda374 commit 56e3ba7

7 files changed

+445
-186
lines changed

hcloud/plugin_provider.go

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"github.com/hetznercloud/hcloud-go/hcloud"
2121
"github.com/hetznercloud/terraform-provider-hcloud/internal/datacenter"
2222
"github.com/hetznercloud/terraform-provider-hcloud/internal/location"
23+
"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
2324
"github.com/hetznercloud/terraform-provider-hcloud/internal/sshkey"
2425
"github.com/hetznercloud/terraform-provider-hcloud/internal/util/tflogutil"
2526
)
@@ -172,6 +173,8 @@ func (p *PluginProvider) DataSources(_ context.Context) []func() datasource.Data
172173
datacenter.NewDataSourceList,
173174
location.NewDataSource,
174175
location.NewDataSourceList,
176+
servertype.NewDataSource,
177+
servertype.NewDataSourceList,
175178
sshkey.NewDataSource,
176179
sshkey.NewDataSourceList,
177180
}

hcloud/provider.go

-3
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/hetznercloud/terraform-provider-hcloud/internal/network"
2828
"github.com/hetznercloud/terraform-provider-hcloud/internal/rdns"
2929
"github.com/hetznercloud/terraform-provider-hcloud/internal/server"
30-
"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
3130
"github.com/hetznercloud/terraform-provider-hcloud/internal/volume"
3231
)
3332

@@ -118,8 +117,6 @@ func Provider() *schema.Provider {
118117
placementgroup.DataSourceListType: placementgroup.DataSourceList(),
119118
server.DataSourceType: server.DataSource(),
120119
server.DataSourceListType: server.DataSourceList(),
121-
servertype.DataSourceType: servertype.DataSource(),
122-
servertype.DataSourceListType: servertype.ServerTypesDataSource(),
123120
volume.DataSourceType: volume.DataSource(),
124121
volume.DataSourceListType: volume.DataSourceList(),
125122
},

hcloud/provider_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
"github.com/hetznercloud/terraform-provider-hcloud/internal/primaryip"
1414
"github.com/hetznercloud/terraform-provider-hcloud/internal/rdns"
1515
"github.com/hetznercloud/terraform-provider-hcloud/internal/server"
16-
"github.com/hetznercloud/terraform-provider-hcloud/internal/servertype"
1716
"github.com/hetznercloud/terraform-provider-hcloud/internal/snapshot"
1817
"github.com/hetznercloud/terraform-provider-hcloud/internal/volume"
1918
"github.com/stretchr/testify/assert"
@@ -81,8 +80,6 @@ func TestProvider_DataSources(t *testing.T) {
8180
placementgroup.DataSourceListType,
8281
server.DataSourceType,
8382
server.DataSourceListType,
84-
servertype.DataSourceType,
85-
servertype.DataSourceListType,
8683
volume.DataSourceType,
8784
volume.DataSourceListType,
8885
}

0 commit comments

Comments
 (0)