refactor: solve cyclic imports

hetznercloud · Jan 9, 2024 · 1ffa0dc · 1ffa0dc
1 parent 344fbf3
commit 1ffa0dc
Show file tree

Hide file tree

Showing 112 changed files with 439 additions and 339 deletions.
diff --git a/internal/cmd/all/all.go b/internal/cmd/all/all.go
@@ -15,7 +15,7 @@ func NewCommand(s state.State) *cobra.Command {
 		DisableFlagsInUseLine: true,
 	}
 	cmd.AddCommand(
-		listCmd.CobraCommand(s),
+		ListCmd.CobraCommand(s),
 	)
 	return cmd
 }
diff --git a/internal/cmd/all/list.go b/internal/cmd/all/list.go
@@ -41,7 +41,7 @@ var allCmds = []base.ListCmd{
 	sshkey.ListCmd,
 }
 
-var listCmd = base.Cmd{
+var ListCmd = base.Cmd{
 	BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
 
 		var resources []string

diff --git a/internal/cmd/all/list_test.go b/internal/cmd/all/list_test.go
@@ -1,4 +1,4 @@
-package all
+package all_test
 
 import (
 	_ "embed"
@@ -9,6 +9,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/all"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -22,7 +23,7 @@ func TestListAll(t *testing.T) {
 
 	time.Local = time.UTC
 
-	cmd := listCmd.CobraCommand(fx.State())
+	cmd := all.ListCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.ServerClient.EXPECT().
@@ -246,7 +247,7 @@ func TestListAllPaidJSON(t *testing.T) {
 
 	time.Local = time.UTC
 
-	cmd := listCmd.CobraCommand(fx.State())
+	cmd := all.ListCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.ServerClient.EXPECT().

diff --git a/internal/cmd/certificate/create_test.go b/internal/cmd/certificate/create_test.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate_test
 
 import (
 	_ "embed"
@@ -8,6 +8,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -22,7 +23,7 @@ func TestCreateManaged(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := CreateCmd.CobraCommand(fx.State())
+	cmd := certificate.CreateCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().
@@ -55,7 +56,7 @@ func TestCreateManagedJSON(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := CreateCmd.CobraCommand(fx.State())
+	cmd := certificate.CreateCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().
@@ -104,7 +105,7 @@ func TestCreateUploaded(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := CreateCmd.CobraCommand(fx.State())
+	cmd := certificate.CreateCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().
@@ -132,7 +133,7 @@ func TestCreateUploadedJSON(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := CreateCmd.CobraCommand(fx.State())
+	cmd := certificate.CreateCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().

diff --git a/internal/cmd/certificate/delete_test.go b/internal/cmd/certificate/delete_test.go
@@ -1,11 +1,12 @@
-package certificate
+package certificate_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -14,7 +15,7 @@ func TestDelete(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := DeleteCmd.CobraCommand(fx.State())
+	cmd := certificate.DeleteCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	cert := &hcloud.Certificate{

diff --git a/internal/cmd/certificate/describe_test.go b/internal/cmd/certificate/describe_test.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate_test
 
 import (
 	"fmt"
@@ -9,6 +9,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/cmd/util"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
@@ -20,7 +21,7 @@ func TestDescribe(t *testing.T) {
 
 	time.Local = time.UTC
 
-	cmd := DescribeCmd.CobraCommand(fx.State())
+	cmd := certificate.DescribeCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	cert := &hcloud.Certificate{

diff --git a/internal/cmd/certificate/labels_test.go b/internal/cmd/certificate/labels_test.go
@@ -1,11 +1,12 @@
-package certificate
+package certificate_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -14,7 +15,7 @@ func TestLabelAdd(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := LabelCmds.AddCobraCommand(fx.State())
+	cmd := certificate.LabelCmds.AddCobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().
@@ -39,7 +40,7 @@ func TestLabelRemove(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := LabelCmds.RemoveCobraCommand(fx.State())
+	cmd := certificate.LabelCmds.RemoveCobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().

diff --git a/internal/cmd/certificate/list_test.go b/internal/cmd/certificate/list_test.go
@@ -1,4 +1,4 @@
-package certificate
+package certificate_test
 
 import (
 	"testing"
@@ -7,6 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -17,7 +18,7 @@ func TestList(t *testing.T) {
 
 	time.Local = time.UTC
 
-	cmd := ListCmd.CobraCommand(fx.State())
+	cmd := certificate.ListCmd.CobraCommand(fx.State())
 
 	fx.ExpectEnsureToken()
 	fx.Client.CertificateClient.EXPECT().

diff --git a/internal/cmd/certificate/update_test.go b/internal/cmd/certificate/update_test.go
@@ -1,11 +1,12 @@
-package certificate
+package certificate_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/certificate"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -14,7 +15,7 @@ func TestUpdateName(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := UpdateCmd.CobraCommand(fx.State())
+	cmd := certificate.UpdateCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.CertificateClient.EXPECT().

diff --git a/internal/cmd/datacenter/describe_test.go b/internal/cmd/datacenter/describe_test.go
@@ -1,11 +1,12 @@
-package datacenter
+package datacenter_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/datacenter"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -14,7 +15,7 @@ func TestDescribe(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := DescribeCmd.CobraCommand(fx.State())
+	cmd := datacenter.DescribeCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
 	fx.Client.DatacenterClient.EXPECT().

diff --git a/internal/cmd/datacenter/list_test.go b/internal/cmd/datacenter/list_test.go
@@ -1,4 +1,4 @@
-package datacenter
+package datacenter_test
 
 import (
 	"testing"
@@ -7,6 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/datacenter"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -17,7 +18,7 @@ func TestList(t *testing.T) {
 
 	time.Local = time.UTC
 
-	cmd := ListCmd.CobraCommand(fx.State())
+	cmd := datacenter.ListCmd.CobraCommand(fx.State())
 
 	fx.ExpectEnsureToken()
 	fx.Client.DatacenterClient.EXPECT().

diff --git a/internal/cmd/firewall/add_rule.go b/internal/cmd/firewall/add_rule.go
@@ -87,7 +87,7 @@ var AddRuleCmd = base.Cmd{
 		case hcloud.FirewallRuleDirectionOut:
 			rule.DestinationIPs = make([]net.IPNet, len(destinationIPs))
 			for i, ip := range destinationIPs {
-				n, err := validateFirewallIP(ip)
+				n, err := ValidateFirewallIP(ip)
 				if err != nil {
 					return fmt.Errorf("destination error on index %d: %s", i, err)
 				}
@@ -96,7 +96,7 @@ var AddRuleCmd = base.Cmd{
 		case hcloud.FirewallRuleDirectionIn:
 			rule.SourceIPs = make([]net.IPNet, len(sourceIPs))
 			for i, ip := range sourceIPs {
-				n, err := validateFirewallIP(ip)
+				n, err := ValidateFirewallIP(ip)
 				if err != nil {
 					return fmt.Errorf("source ips error on index %d: %s", i, err)
 				}

diff --git a/internal/cmd/firewall/add_rule_test.go b/internal/cmd/firewall/add_rule_test.go
@@ -1,4 +1,4 @@
-package firewall
+package firewall_test
 
 import (
 	"net"
@@ -7,6 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/firewall"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -15,19 +16,19 @@ func TestAddRule(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := AddRuleCmd.CobraCommand(fx.State())
+	cmd := firewall.AddRuleCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
-	firewall := &hcloud.Firewall{
+	fw := &hcloud.Firewall{
 		ID:   123,
 		Name: "test",
 	}
 
 	fx.Client.FirewallClient.EXPECT().
 		Get(gomock.Any(), "test").
-		Return(firewall, nil, nil)
+		Return(fw, nil, nil)
 	fx.Client.FirewallClient.EXPECT().
-		SetRules(gomock.Any(), firewall, hcloud.FirewallSetRulesOpts{
+		SetRules(gomock.Any(), fw, hcloud.FirewallSetRulesOpts{
 			Rules: []hcloud.FirewallRule{{
 				Direction:      hcloud.FirewallRuleDirectionIn,
 				SourceIPs:      []net.IPNet{{IP: net.IP{0, 0, 0, 0}, Mask: net.IPMask{0, 0, 0, 0}}},

diff --git a/internal/cmd/firewall/apply_to_resource_test.go b/internal/cmd/firewall/apply_to_resource_test.go
@@ -1,11 +1,12 @@
-package firewall
+package firewall_test
 
 import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 
+	"github.com/hetznercloud/cli/internal/cmd/firewall"
 	"github.com/hetznercloud/cli/internal/testutil"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
@@ -14,22 +15,22 @@ func TestApplyToServer(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := ApplyToResourceCmd.CobraCommand(fx.State())
+	cmd := firewall.ApplyToResourceCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
-	firewall := &hcloud.Firewall{
+	fw := &hcloud.Firewall{
 		ID:   123,
 		Name: "test",
 	}
 
 	fx.Client.FirewallClient.EXPECT().
 		Get(gomock.Any(), "test").
-		Return(firewall, nil, nil)
+		Return(fw, nil, nil)
 	fx.Client.ServerClient.EXPECT().
 		Get(gomock.Any(), "my-server").
 		Return(&hcloud.Server{ID: 456}, nil, nil)
 	fx.Client.FirewallClient.EXPECT().
-		ApplyResources(gomock.Any(), firewall, []hcloud.FirewallResource{{
+		ApplyResources(gomock.Any(), fw, []hcloud.FirewallResource{{
 			Type: hcloud.FirewallResourceTypeServer,
 			Server: &hcloud.FirewallResourceServer{
 				ID: 456,
@@ -52,19 +53,19 @@ func TestApplyToLabelSelector(t *testing.T) {
 	fx := testutil.NewFixture(t)
 	defer fx.Finish()
 
-	cmd := ApplyToResourceCmd.CobraCommand(fx.State())
+	cmd := firewall.ApplyToResourceCmd.CobraCommand(fx.State())
 	fx.ExpectEnsureToken()
 
-	firewall := &hcloud.Firewall{
+	fw := &hcloud.Firewall{
 		ID:   123,
 		Name: "test",
 	}
 
 	fx.Client.FirewallClient.EXPECT().
 		Get(gomock.Any(), "test").
-		Return(firewall, nil, nil)
+		Return(fw, nil, nil)
 	fx.Client.FirewallClient.EXPECT().
-		ApplyResources(gomock.Any(), firewall, []hcloud.FirewallResource{{
+		ApplyResources(gomock.Any(), fw, []hcloud.FirewallResource{{
 			Type: hcloud.FirewallResourceTypeLabelSelector,
 			LabelSelector: &hcloud.FirewallResourceLabelSelector{
 				Selector: "my-label",