refactor: move subroutines to pkg to allow for reuse

openmfp · Apr 25, 2024 · 3436f07 · 3436f07
1 parent 5a22df1
commit 3436f07
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -16,6 +16,7 @@ COPY main.go main.go
 COPY cmd/ cmd/
 COPY api/ api/
 COPY internal/ internal/
+COPY pkg/ pkg/
 
 
 # Build

diff --git a/internal/controller/account_controller.go b/internal/controller/account_controller.go
@@ -24,7 +24,7 @@ import (
 
 	corev1alpha1 "github.com/openmfp/account-operator/api/v1alpha1"
 	"github.com/openmfp/account-operator/internal/config"
-	"github.com/openmfp/account-operator/internal/subroutines"
+	"github.com/openmfp/account-operator/pkg/subroutines"
 	"github.com/openmfp/golang-commons/controller/lifecycle"
 	"github.com/openmfp/golang-commons/logger"
 )

diff --git a/internal/controller/account_controller_test.go b/internal/controller/account_controller_test.go
@@ -20,7 +20,7 @@ import (
 
 	corev1alpha1 "github.com/openmfp/account-operator/api/v1alpha1"
 	"github.com/openmfp/account-operator/internal/config"
-	"github.com/openmfp/account-operator/internal/subroutines"
+	"github.com/openmfp/account-operator/pkg/subroutines"
 	openmfpcontext "github.com/openmfp/golang-commons/context"
 	"github.com/openmfp/golang-commons/logger"
 )

diff --git a/internal/subroutines/doc.go → pkg/subroutines/doc.go b/internal/subroutines/doc.go → pkg/subroutines/doc.go
diff --git a/internal/subroutines/mocks/client.go → pkg/subroutines/mocks/client.go b/internal/subroutines/mocks/client.go → pkg/subroutines/mocks/client.go
diff --git a/internal/subroutines/namespace.go → pkg/subroutines/namespace.go b/internal/subroutines/namespace.go → pkg/subroutines/namespace.go
diff --git a/internal/subroutines/namespace_test.go → pkg/subroutines/namespace_test.go b/internal/subroutines/namespace_test.go → pkg/subroutines/namespace_test.go
@@ -15,7 +15,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	corev1alpha1 "github.com/openmfp/account-operator/api/v1alpha1"
-	"github.com/openmfp/account-operator/internal/subroutines/mocks"
+	"github.com/openmfp/account-operator/pkg/subroutines/mocks"
 )
 
 const defaultExpectedTestNamespace = "account-test"