refactor: move packages to internal (#626)

Clean up the root directory and move all non-public packages (all except `cmd`) into the `internal` namespace.
hetznercloud · Jun 21, 2024 · c53658e · c53658e
1 parent 35034a6
commit c53658e
Show file tree

Hide file tree

Showing 34 changed files with 38 additions and 43 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,10 +1,5 @@
 *
-!api/
-!app/
 !cmd/
-!csi/
-!driver/
-!metrics/
-!volumes/
+!internal/
 !go.mod
 !go.sum
diff --git a/cmd/aio/main.go b/cmd/aio/main.go
@@ -10,10 +10,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/hetznercloud/csi-driver/api"
-	"github.com/hetznercloud/csi-driver/app"
-	"github.com/hetznercloud/csi-driver/driver"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/api"
+	"github.com/hetznercloud/csi-driver/internal/app"
+	"github.com/hetznercloud/csi-driver/internal/driver"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/metadata"
 )
 

diff --git a/cmd/controller/main.go b/cmd/controller/main.go
@@ -7,10 +7,10 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/hetznercloud/csi-driver/api"
-	"github.com/hetznercloud/csi-driver/app"
-	"github.com/hetznercloud/csi-driver/driver"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/api"
+	"github.com/hetznercloud/csi-driver/internal/app"
+	"github.com/hetznercloud/csi-driver/internal/driver"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/metadata"
 )
 

diff --git a/cmd/node/main.go b/cmd/node/main.go
@@ -10,9 +10,9 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/hetznercloud/csi-driver/app"
-	"github.com/hetznercloud/csi-driver/driver"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/app"
+	"github.com/hetznercloud/csi-driver/internal/driver"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/metadata"
 )
 

diff --git a/api/helper.go → internal/api/helper.go b/api/helper.go → internal/api/helper.go
@@ -1,7 +1,7 @@
 package api
 
 import (
-	"github.com/hetznercloud/csi-driver/csi"
+	"github.com/hetznercloud/csi-driver/internal/csi"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
 

diff --git a/api/volume.go → internal/api/volume.go b/api/volume.go → internal/api/volume.go
@@ -7,8 +7,8 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
 

diff --git a/api/volume_test.go → internal/api/volume_test.go b/api/volume_test.go → internal/api/volume_test.go
@@ -9,9 +9,9 @@ import (
 	"github.com/go-kit/log"
 	"github.com/stretchr/testify/assert"
 
-	"github.com/hetznercloud/csi-driver/csi"
+	"github.com/hetznercloud/csi-driver/internal/csi"
 	"github.com/hetznercloud/csi-driver/internal/mocked"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/schema"
 )

diff --git a/app/app.go → internal/app/app.go b/app/app.go → internal/app/app.go
@@ -16,8 +16,8 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 	"google.golang.org/grpc"
 
-	"github.com/hetznercloud/csi-driver/driver"
-	"github.com/hetznercloud/csi-driver/metrics"
+	"github.com/hetznercloud/csi-driver/internal/driver"
+	"github.com/hetznercloud/csi-driver/internal/metrics"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud/metadata"
 )

diff --git a/csi/server.go → internal/csi/server.go b/csi/server.go → internal/csi/server.go
diff --git a/csi/volume.go → internal/csi/volume.go b/csi/volume.go → internal/csi/volume.go
diff --git a/driver/controller.go → internal/driver/controller.go b/driver/controller.go → internal/driver/controller.go
@@ -12,8 +12,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 type ControllerService struct {

diff --git a/driver/controller_test.go → internal/driver/controller_test.go b/driver/controller_test.go → internal/driver/controller_test.go
@@ -10,9 +10,9 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/mock"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/mock"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 var _ proto.ControllerServer = (*ControllerService)(nil)

diff --git a/driver/driver.go → internal/driver/driver.go b/driver/driver.go → internal/driver/driver.go
diff --git a/driver/helper.go → internal/driver/helper.go b/driver/helper.go → internal/driver/helper.go
diff --git a/driver/helper_test.go → internal/driver/helper_test.go b/driver/helper_test.go → internal/driver/helper_test.go
diff --git a/driver/identity.go → internal/driver/identity.go b/driver/identity.go → internal/driver/identity.go
diff --git a/driver/identity_test.go → internal/driver/identity_test.go b/driver/identity_test.go → internal/driver/identity_test.go
diff --git a/driver/node.go → internal/driver/node.go b/driver/node.go → internal/driver/node.go
@@ -10,7 +10,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 type NodeService struct {

diff --git a/driver/node_test.go → internal/driver/node_test.go b/driver/node_test.go → internal/driver/node_test.go
@@ -10,8 +10,8 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 
-	"github.com/hetznercloud/csi-driver/mock"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/mock"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 var _ proto.NodeServer = (*NodeService)(nil)

diff --git a/driver/sanity_test.go → internal/driver/sanity_test.go b/driver/sanity_test.go → internal/driver/sanity_test.go
@@ -15,8 +15,8 @@ import (
 	"github.com/kubernetes-csi/csi-test/v5/pkg/sanity"
 	"google.golang.org/grpc"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 func TestSanity(t *testing.T) {

diff --git a/metrics/metrics.go → internal/metrics/metrics.go b/metrics/metrics.go → internal/metrics/metrics.go
diff --git a/mock/volume.go → internal/mock/volume.go b/mock/volume.go → internal/mock/volume.go
@@ -3,8 +3,8 @@ package mock
 import (
 	"context"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 	"github.com/hetznercloud/hcloud-go/v2/hcloud"
 )
 

diff --git a/volumes/cryptsetup.go → internal/volumes/cryptsetup.go b/volumes/cryptsetup.go → internal/volumes/cryptsetup.go
diff --git a/volumes/idempotency.go → internal/volumes/idempotency.go b/volumes/idempotency.go → internal/volumes/idempotency.go
@@ -6,7 +6,7 @@ import (
 	"github.com/go-kit/log"
 	"github.com/go-kit/log/level"
 
-	"github.com/hetznercloud/csi-driver/csi"
+	"github.com/hetznercloud/csi-driver/internal/csi"
 )
 
 // IdempotentService wraps a volume service and provides idempotency as required by the CSI spec.

diff --git a/volumes/idempotency_test.go → internal/volumes/idempotency_test.go b/volumes/idempotency_test.go → internal/volumes/idempotency_test.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/go-kit/log"
 
-	"github.com/hetznercloud/csi-driver/csi"
-	"github.com/hetznercloud/csi-driver/mock"
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/csi"
+	"github.com/hetznercloud/csi-driver/internal/mock"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 var _ volumes.Service = (*volumes.IdempotentService)(nil)

diff --git a/volumes/mount.go → internal/volumes/mount.go b/volumes/mount.go → internal/volumes/mount.go
diff --git a/volumes/mount_test.go → internal/volumes/mount_test.go b/volumes/mount_test.go → internal/volumes/mount_test.go
diff --git a/volumes/resize.go → internal/volumes/resize.go b/volumes/resize.go → internal/volumes/resize.go
diff --git a/volumes/resize_test.go → internal/volumes/resize_test.go b/volumes/resize_test.go → internal/volumes/resize_test.go
diff --git a/volumes/service.go → internal/volumes/service.go b/volumes/service.go → internal/volumes/service.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/hetznercloud/csi-driver/csi"
+	"github.com/hetznercloud/csi-driver/internal/csi"
 )
 
 var (

diff --git a/volumes/stats.go → internal/volumes/stats.go b/volumes/stats.go → internal/volumes/stats.go
diff --git a/volumes/stats_test.go → internal/volumes/stats_test.go b/volumes/stats_test.go → internal/volumes/stats_test.go
diff --git a/test/integration/cryptsetup_test.go b/test/integration/cryptsetup_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/go-kit/log"
 
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 func TestCryptSetup(t *testing.T) {

diff --git a/test/integration/volumes_test.go b/test/integration/volumes_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/go-kit/log"
 
-	"github.com/hetznercloud/csi-driver/volumes"
+	"github.com/hetznercloud/csi-driver/internal/volumes"
 )
 
 func TestVolumePublishUnpublish(t *testing.T) {