Merge branch 'main' into upgrade-hcloud-go-v2

.github/workflows/test.yml

@@ -51,8 +51,6 @@ jobs:
             version: v1.7.x
           - tool: opentofu
             version: v1.8.x
-          - tool: terraform
-            version: v1.8.x
           - tool: terraform
             version: v1.9.x
 

README.md

@@ -7,9 +7,9 @@
 
 ## Requirements
 
-- [Terraform](https://developer.hashicorp.com/terraform/downloads)
-  - HashiCorp recommends to use the two latest terraform releases (1.8.x, 1.9.x). Our test suite validates that our provider works with these versions.
-  - This provider uses the [terraform plugin protocol version 6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6), and should work with all tools (ie. Terraform & OpenTofu) that supports it.
+- [Terraform](https://developer.hashicorp.com/terraform/install) or [OpenTofu](https://opentofu.org/docs/intro/install/)
+  - Our provider tests run with Terraform or OpenTofu releases that are supported upstream.
+  - Our provider should work with any tool that supports the [terraform plugin protocol version 6](https://developer.hashicorp.com/terraform/plugin/terraform-plugin-protocol#protocol-version-6).
 - [Go](https://go.dev/doc/install) 1.21.x (to build the provider plugin)
 
 ## API Stability

internal/certificate/data_source_test.go

@@ -8,11 +8,12 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testsupport"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceCertificateTest(t *testing.T) {
+func TestAccCertificateDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	res := certificate.NewUploadedRData(t, "datasource-test", "TFtestAcc")
@@ -65,7 +66,7 @@ func TestAccHcloudDataSourceCertificateTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceCertificateListTest(t *testing.T) {
+func TestAccCertificateDataSourceList(t *testing.T) {
 	res := certificate.NewUploadedRData(t, "datasource-test", "TFtestAcc")
 
 	certificateBySel := &certificate.DDataList{

internal/certificate/resource_test.go

@@ -21,7 +21,7 @@ var (
 	certDomain = os.Getenv("CERT_DOMAIN")
 )
 
-func TestCertificateResource_Uploaded_Basic(t *testing.T) {
+func TestAccCertificateResource_Uploaded(t *testing.T) {
 	var cert hcloud.Certificate
 
 	res := certificate.NewUploadedRData(t, "basic-cert", "TFAccTests")
@@ -63,7 +63,7 @@ func TestCertificateResource_Uploaded_Basic(t *testing.T) {
 	})
 }
 
-func TestCertificateResource_Uploaded_ChangeCertRequiresNewResource(t *testing.T) {
+func TestAccCertificateResource_Uploaded_ChangeCertRequiresNewResource(t *testing.T) {
 	var cert, newCert hcloud.Certificate
 
 	res := certificate.NewUploadedRData(t, "basic-cert", "TFAccTests")
@@ -113,7 +113,7 @@ func TestCertificateResource_Uploaded_ChangeCertRequiresNewResource(t *testing.T
 	})
 }
 
-func TestCertificateResource_Managed_Basic(t *testing.T) {
+func TestAccCertificateResource_Managed(t *testing.T) {
 	if certDomain == "" {
 		t.Skip("Skipping because CERT_DOMAIN is not set")
 	}

internal/datacenter/data_source_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceDatacenterTest(t *testing.T) {
+func TestAccDatacenterDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	dcByName := &datacenter.DData{
@@ -43,7 +43,7 @@ func TestAccHcloudDataSourceDatacenterTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceDatacenter_UpgradePluginFramework(t *testing.T) {
+func TestAccDatacenterDataSource_UpgradePluginFramework(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	dcByName := &datacenter.DData{
@@ -88,7 +88,7 @@ func TestAccHcloudDataSourceDatacenter_UpgradePluginFramework(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceDatacentersTest(t *testing.T) {
+func TestAccDatacenterDataSourceList(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	datacentersD := &datacenter.DDataList{}
@@ -128,7 +128,7 @@ func TestAccHcloudDataSourceDatacentersTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceDatacenters_UpgradePluginFramework(t *testing.T) {
+func TestAccDatacenterDataSourceList_UpgradePluginFramework(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	datacentersD := &datacenter.DDataList{}

internal/firewall/attachment_resource_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAttachmentResource_Servers(t *testing.T) {
+func TestAccFirewallAttachmentResource_Servers(t *testing.T) {
 	var (
 		srv hcloud.Server
 		fw  hcloud.Firewall
@@ -56,7 +56,7 @@ func TestAttachmentResource_Servers(t *testing.T) {
 	})
 }
 
-func TestAttachmentResource_LabelSelectors(t *testing.T) {
+func TestAccFirewallAttachmentResource_LabelSelectors(t *testing.T) {
 	var (
 		srv hcloud.Server
 		fw  hcloud.Firewall

internal/firewall/data_source_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceFirewallTest(t *testing.T) {
+func TestAccFirewallDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	res := firewall.NewRData(t, "basic-firewall", []firewall.RDataRule{}, nil)
@@ -64,7 +64,7 @@ func TestAccHcloudDataSourceFirewallTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceFirewallListTest(t *testing.T) {
+func TestAccFirewallDataSourceList(t *testing.T) {
 	res := firewall.NewRData(t, "firewall-ds-test", []firewall.RDataRule{}, nil)
 
 	firewallBySel := &firewall.DDataList{

internal/firewall/resource_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestFirewallResource_Basic(t *testing.T) {
+func TestAccFirewallResource(t *testing.T) {
 	var f hcloud.Firewall
 
 	res := firewall.NewRData(t, "basic-firewall", []firewall.RDataRule{
@@ -110,7 +110,7 @@ func TestFirewallResource_Basic(t *testing.T) {
 	})
 }
 
-func TestFirewallResource_ApplyTo(t *testing.T) {
+func TestAccFirewallResource_ApplyTo(t *testing.T) {
 	var f hcloud.Firewall
 
 	res := firewall.NewRData(t, "applyto-firewall", []firewall.RDataRule{
@@ -179,7 +179,7 @@ func TestFirewallResource_ApplyTo(t *testing.T) {
 	})
 }
 
-func TestFirewallResource_Normalization(t *testing.T) {
+func TestAccFirewallResource_Normalization(t *testing.T) {
 	var f hcloud.Firewall
 
 	res := firewall.NewRData(t, "ipv6-firewall", []firewall.RDataRule{

internal/floatingip/data_source_test.go

@@ -6,15 +6,17 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/floatingip"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testsupport"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceFloatingIPTest(t *testing.T) {
+func TestAccFloatingIPDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	res := &floatingip.RData{
@@ -75,7 +77,7 @@ func TestAccHcloudDataSourceFloatingIPTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceFloatingIPListTest(t *testing.T) {
+func TestAccFloatingIPDataSourceList(t *testing.T) {
 	res := &floatingip.RData{
 		Name: "floatingip-ds-test",
 		Type: "ipv4",

internal/floatingip/resource_assignment_test.go

@@ -5,6 +5,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/sshkey"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 
@@ -17,7 +18,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestFloatingIPAssignmentResource_Basic(t *testing.T) {
+func TestAccFloatingIPAssignmentResource(t *testing.T) {
 	var s hcloud.Server
 	var s2 hcloud.Server
 	var f hcloud.FloatingIP

internal/floatingip/resource_test.go

@@ -16,7 +16,7 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestFloatingIPResource_Basic(t *testing.T) {
+func TestAccFloatingIPResource(t *testing.T) {
 	var fip hcloud.FloatingIP
 
 	res := &floatingip.RData{
@@ -65,7 +65,7 @@ func TestFloatingIPResource_Basic(t *testing.T) {
 		},
 	})
 }
-func TestFloatingIPResource_WithServer(t *testing.T) {
+func TestAccFloatingIPResource_WithServer(t *testing.T) {
 	var fip hcloud.FloatingIP
 	tmplMan := testtemplate.Manager{}
 
@@ -117,7 +117,7 @@ func TestFloatingIPResource_WithServer(t *testing.T) {
 	})
 }
 
-func TestFloatingIPResource_Protection(t *testing.T) {
+func TestAccFloatingIPResource_Protection(t *testing.T) {
 	var (
 		fip hcloud.FloatingIP
 

internal/image/data_source_test.go

@@ -7,12 +7,13 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/loadbalancer"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testsupport"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceImageTest(t *testing.T) {
+func TestAccImageDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	imageByName := &image.DData{
@@ -49,7 +50,7 @@ func TestAccHcloudDataSourceImageTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceImageWithFiltersTest(t *testing.T) {
+func TestAccImageDataSource_WithFilters(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	imageByName := &image.DData{
@@ -80,7 +81,7 @@ func TestAccHcloudDataSourceImageWithFiltersTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceImageListTest(t *testing.T) {
+func TestAccImageDataSourceList(t *testing.T) {
 	allImagesSel := &image.DDataList{}
 	allImagesSel.SetRName("all_images_sel")
 

internal/loadbalancer/data_source_test.go

@@ -8,13 +8,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/loadbalancer"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testsupport"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
 )
 
-func TestAccHcloudDataSourceLoadBalancerTest(t *testing.T) {
+func TestAccLoadBalancerDataSource(t *testing.T) {
 	tmplMan := testtemplate.Manager{}
 
 	res := &loadbalancer.RData{
@@ -79,7 +80,7 @@ func TestAccHcloudDataSourceLoadBalancerTest(t *testing.T) {
 	})
 }
 
-func TestAccHcloudDataSourceLoadBalancerListTest(t *testing.T) {
+func TestAccLoadBalancerDataSourceList(t *testing.T) {
 	res := &loadbalancer.RData{
 		Name:         "some-load-balancer",
 		LocationName: teste2e.TestLocationName,

internal/loadbalancer/resource_network_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
+	"github.com/stretchr/testify/assert"
 
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -14,10 +15,9 @@ import (
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/teste2e"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testsupport"
 	"github.com/hetznercloud/terraform-provider-hcloud/internal/testtemplate"
-	"github.com/stretchr/testify/assert"
 )
 
-func TestAccHcloudLoadBalancerNetwork_NetworkID(t *testing.T) {
+func TestAccLoadBalancerNetworkResource_NetworkID(t *testing.T) {
 	var (
 		nw hcloud.Network
 		lb hcloud.LoadBalancer
@@ -101,7 +101,7 @@ func TestAccHcloudLoadBalancerNetwork_NetworkID(t *testing.T) {
 	})
 }
 
-func TestAccHcloudLoadBalancerNetwork_SubNetID(t *testing.T) {
+func TestAccLoadBalancerNetworkResource_SubNetID(t *testing.T) {
 	var (
 		nw hcloud.Network
 		lb hcloud.LoadBalancer
@@ -153,7 +153,7 @@ func TestAccHcloudLoadBalancerNetwork_SubNetID(t *testing.T) {
 	})
 }
 
-func TestAccHcloudLoadBalancerNetwork_CannotAttachToTwoNetworks(t *testing.T) {
+func TestAccLoadBalancerNetworkResource_CannotAttachToTwoNetworks(t *testing.T) {
 	nwRess := make([]*network.RData, 2)
 	snRess := make([]*network.RDataSubnet, len(nwRess))
 	for i := 0; i < len(nwRess); i++ {