Move all internal to pkg

giantswarm · Feb 6, 2025 · 5a0eb00 · 5a0eb00
1 parent 08f5585
commit 5a0eb00
Show file tree

Hide file tree

Showing 21 changed files with 30 additions and 30 deletions.
diff --git a/cmd/fetchkeys/runner.go b/cmd/fetchkeys/runner.go
@@ -9,8 +9,8 @@ import (
 	"github.com/giantswarm/micrologger"
 	"github.com/spf13/cobra"
 
-	"github.com/giantswarm/konfigure/internal/sopsenv"
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/sopsenv"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
 )
 
 type runner struct {

diff --git a/cmd/generate/flag.go b/cmd/generate/flag.go
@@ -4,7 +4,7 @@ import (
 	"github.com/giantswarm/microerror"
 	"github.com/spf13/cobra"
 
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
 )
 
 const (

diff --git a/cmd/generate/runner.go b/cmd/generate/runner.go
@@ -16,9 +16,9 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
 
-	"github.com/giantswarm/konfigure/internal/generator"
-	"github.com/giantswarm/konfigure/internal/meta"
-	"github.com/giantswarm/konfigure/internal/vaultclient"
+	"github.com/giantswarm/konfigure/pkg/meta"
+	"github.com/giantswarm/konfigure/pkg/service"
+	"github.com/giantswarm/konfigure/pkg/vaultclient"
 )
 
 const (
@@ -72,9 +72,9 @@ func (r *runner) run(ctx context.Context, cmd *cobra.Command, args []string) err
 			}
 		}
 
-		var gen *generator.Service
+		var gen *service.Service
 		{
-			c := generator.Config{
+			c := service.Config{
 				VaultClient: vaultClient,
 
 				Log:            r.logger,
@@ -85,13 +85,13 @@ func (r *runner) run(ctx context.Context, cmd *cobra.Command, args []string) err
 				Verbose:        r.flag.Verbose,
 			}
 
-			gen, err = generator.New(c)
+			gen, err = service.New(c)
 			if err != nil {
 				return microerror.Mask(err)
 			}
 		}
 
-		in := generator.GenerateInput{
+		in := service.GenerateInput{
 			App:       r.flag.AppName,
 			Name:      addNameSuffix(r.flag.Name),
 			Namespace: giantswarmNamespace,

diff --git a/cmd/kustomizepatch/runner.go b/cmd/kustomizepatch/runner.go
@@ -28,10 +28,10 @@ import (
 	kyaml "sigs.k8s.io/kustomize/kyaml/yaml"
 	"sigs.k8s.io/yaml"
 
-	"github.com/giantswarm/konfigure/internal/generator"
-	"github.com/giantswarm/konfigure/internal/meta"
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
-	"github.com/giantswarm/konfigure/internal/vaultclient"
+	"github.com/giantswarm/konfigure/pkg/meta"
+	"github.com/giantswarm/konfigure/pkg/service"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/vaultclient"
 )
 
 const (
@@ -161,9 +161,9 @@ func (r *runner) run(items []*kyaml.RNode) ([]*kyaml.RNode, error) {
 			}
 		}
 
-		var gen *generator.Service
+		var gen *service.Service
 		{
-			c := generator.Config{
+			c := service.Config{
 				VaultClient: vaultClient,
 
 				Log:            r.logger,
@@ -173,13 +173,13 @@ func (r *runner) run(items []*kyaml.RNode) ([]*kyaml.RNode, error) {
 				SOPSKeysSource: sopsKeysSource,
 			}
 
-			gen, err = generator.New(c)
+			gen, err = service.New(c)
 			if err != nil {
 				return nil, microerror.Mask(err)
 			}
 		}
 
-		in := generator.GenerateInput{
+		in := service.GenerateInput{
 			App:       r.config.AppName,
 			Name:      addNameSuffix(r.config.Name),
 			Namespace: giantswarmNamespace,

diff --git a/pkg/decrypt/vault_decrypter.go b/pkg/decrypt/vault_decrypter.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"encoding/base64"
 
-	"github.com/giantswarm/konfigure/internal/vaultclient"
+	"github.com/giantswarm/konfigure/pkg/vaultclient"
 
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/valuemodifier/vault/decrypt"

diff --git a/pkg/generator/generator_test.go b/pkg/generator/generator_test.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/giantswarm/konfigure/internal/sopsenv"
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
-	"github.com/giantswarm/konfigure/internal/testutils"
+	"github.com/giantswarm/konfigure/pkg/sopsenv"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/testutils"
 
 	"github.com/ghodss/yaml"
 	"github.com/giantswarm/microerror"

diff --git a/internal/meta/annotation.go → pkg/meta/annotation.go b/internal/meta/annotation.go → pkg/meta/annotation.go
diff --git a/internal/meta/label.go → pkg/meta/label.go b/internal/meta/label.go → pkg/meta/label.go
diff --git a/internal/meta/meta.go → pkg/meta/meta.go b/internal/meta/meta.go → pkg/meta/meta.go
diff --git a/internal/meta/types.go → pkg/meta/types.go b/internal/meta/types.go → pkg/meta/types.go
diff --git a/internal/generator/error.go → pkg/service/error.go b/internal/generator/error.go → pkg/service/error.go
@@ -1,4 +1,4 @@
-package generator
+package service
 
 import (
 	"github.com/giantswarm/microerror"

diff --git a/internal/generator/service.go → pkg/service/service.go b/internal/generator/service.go → pkg/service/service.go
@@ -1,20 +1,20 @@
-package generator
+package service
 
 import (
 	"context"
 
-	"github.com/giantswarm/konfigure/internal/vaultclient"
+	"github.com/giantswarm/konfigure/pkg/vaultclient"
 
 	"github.com/giantswarm/microerror"
 	"github.com/giantswarm/micrologger"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
-	"github.com/giantswarm/konfigure/internal/meta"
-	"github.com/giantswarm/konfigure/internal/sopsenv"
 	"github.com/giantswarm/konfigure/pkg/decrypt"
 	"github.com/giantswarm/konfigure/pkg/filesystem"
 	"github.com/giantswarm/konfigure/pkg/generator"
+	"github.com/giantswarm/konfigure/pkg/meta"
+	"github.com/giantswarm/konfigure/pkg/sopsenv"
 	"github.com/giantswarm/konfigure/pkg/xstrings"
 )
 

diff --git a/internal/sopsenv/error.go → pkg/sopsenv/error.go b/internal/sopsenv/error.go → pkg/sopsenv/error.go
diff --git a/internal/sopsenv/key/key.go → pkg/sopsenv/key/key.go b/internal/sopsenv/key/key.go → pkg/sopsenv/key/key.go
diff --git a/internal/sopsenv/sopsenv.go → pkg/sopsenv/sopsenv.go b/internal/sopsenv/sopsenv.go → pkg/sopsenv/sopsenv.go
@@ -16,7 +16,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	ctrl "sigs.k8s.io/controller-runtime"
 
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
 
 	// GS stuff uses `kgs`-generated kubeconfigs that use
 	// `oidc` auth provider. This import makes is possible to

diff --git a/internal/sopsenv/sopsenv_test.go → pkg/sopsenv/sopsenv_test.go b/internal/sopsenv/sopsenv_test.go → pkg/sopsenv/sopsenv_test.go
@@ -16,8 +16,8 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	clientgofake "k8s.io/client-go/kubernetes/fake"
 
-	"github.com/giantswarm/konfigure/internal/sopsenv/key"
-	"github.com/giantswarm/konfigure/internal/testutils"
+	"github.com/giantswarm/konfigure/pkg/sopsenv/key"
+	"github.com/giantswarm/konfigure/pkg/testutils"
 )
 
 func TestSetups(t *testing.T) {

diff --git a/...al/sopsenv/testdata/expected/expected.tgz → pkg/sopsenv/testdata/expected/expected.tgz b/...al/sopsenv/testdata/expected/expected.tgz → pkg/sopsenv/testdata/expected/expected.tgz
diff --git a/internal/sopsenv/testdata/keys/keys.tgz → pkg/sopsenv/testdata/keys/keys.tgz b/internal/sopsenv/testdata/keys/keys.tgz → pkg/sopsenv/testdata/keys/keys.tgz
diff --git a/internal/testutils/testutils.go → pkg/testutils/testutils.go b/internal/testutils/testutils.go → pkg/testutils/testutils.go
diff --git a/internal/vaultclient/error.go → pkg/vaultclient/error.go b/internal/vaultclient/error.go → pkg/vaultclient/error.go
diff --git a/internal/vaultclient/vaultclient.go → pkg/vaultclient/vaultclient.go b/internal/vaultclient/vaultclient.go → pkg/vaultclient/vaultclient.go