diff --git a/cmd/flux/bootstrap_bitbucket_server.go b/cmd/flux/bootstrap_bitbucket_server.go index b620fa61..be8e0045 100644 --- a/cmd/flux/bootstrap_bitbucket_server.go +++ b/cmd/flux/bootstrap_bitbucket_server.go @@ -25,11 +25,11 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/bootstrap" - "github.com/fluxcd/flux2/internal/bootstrap/git/gogit" - "github.com/fluxcd/flux2/internal/bootstrap/provider" "github.com/fluxcd/flux2/internal/flags" "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/pkg/bootstrap" + "github.com/fluxcd/flux2/pkg/bootstrap/git/gogit" + "github.com/fluxcd/flux2/pkg/bootstrap/provider" "github.com/fluxcd/flux2/pkg/manifestgen" "github.com/fluxcd/flux2/pkg/manifestgen/install" "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" diff --git a/cmd/flux/bootstrap_git.go b/cmd/flux/bootstrap_git.go index 2f5e2491..e0da5bb4 100644 --- a/cmd/flux/bootstrap_git.go +++ b/cmd/flux/bootstrap_git.go @@ -31,10 +31,10 @@ import ( "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" - "github.com/fluxcd/flux2/internal/bootstrap" - "github.com/fluxcd/flux2/internal/bootstrap/git/gogit" "github.com/fluxcd/flux2/internal/flags" "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/pkg/bootstrap" + "github.com/fluxcd/flux2/pkg/bootstrap/git/gogit" "github.com/fluxcd/flux2/pkg/manifestgen" "github.com/fluxcd/flux2/pkg/manifestgen/install" "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" diff --git a/cmd/flux/bootstrap_github.go b/cmd/flux/bootstrap_github.go index 14261820..c49bd483 100644 --- a/cmd/flux/bootstrap_github.go +++ b/cmd/flux/bootstrap_github.go @@ -25,11 +25,11 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/bootstrap" - "github.com/fluxcd/flux2/internal/bootstrap/git/gogit" - "github.com/fluxcd/flux2/internal/bootstrap/provider" "github.com/fluxcd/flux2/internal/flags" "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/pkg/bootstrap" + "github.com/fluxcd/flux2/pkg/bootstrap/git/gogit" + "github.com/fluxcd/flux2/pkg/bootstrap/provider" "github.com/fluxcd/flux2/pkg/manifestgen" "github.com/fluxcd/flux2/pkg/manifestgen/install" "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" diff --git a/cmd/flux/bootstrap_gitlab.go b/cmd/flux/bootstrap_gitlab.go index 56768042..86f498c6 100644 --- a/cmd/flux/bootstrap_gitlab.go +++ b/cmd/flux/bootstrap_gitlab.go @@ -27,11 +27,11 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/http" "github.com/spf13/cobra" - "github.com/fluxcd/flux2/internal/bootstrap" - "github.com/fluxcd/flux2/internal/bootstrap/git/gogit" - "github.com/fluxcd/flux2/internal/bootstrap/provider" "github.com/fluxcd/flux2/internal/flags" "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/pkg/bootstrap" + "github.com/fluxcd/flux2/pkg/bootstrap/git/gogit" + "github.com/fluxcd/flux2/pkg/bootstrap/provider" "github.com/fluxcd/flux2/pkg/manifestgen" "github.com/fluxcd/flux2/pkg/manifestgen/install" "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" diff --git a/internal/bootstrap/bootstrap.go b/pkg/bootstrap/bootstrap.go similarity index 100% rename from internal/bootstrap/bootstrap.go rename to pkg/bootstrap/bootstrap.go diff --git a/internal/bootstrap/bootstrap_plain_git.go b/pkg/bootstrap/bootstrap_plain_git.go similarity index 99% rename from internal/bootstrap/bootstrap_plain_git.go rename to pkg/bootstrap/bootstrap_plain_git.go index 685c1f0d..909eb3b2 100644 --- a/internal/bootstrap/bootstrap_plain_git.go +++ b/pkg/bootstrap/bootstrap_plain_git.go @@ -38,8 +38,8 @@ import ( "github.com/fluxcd/pkg/kustomize/filesys" runclient "github.com/fluxcd/pkg/runtime/client" - "github.com/fluxcd/flux2/internal/bootstrap/git" "github.com/fluxcd/flux2/internal/utils" + "github.com/fluxcd/flux2/pkg/bootstrap/git" "github.com/fluxcd/flux2/pkg/log" "github.com/fluxcd/flux2/pkg/manifestgen/install" "github.com/fluxcd/flux2/pkg/manifestgen/kustomization" diff --git a/internal/bootstrap/bootstrap_provider.go b/pkg/bootstrap/bootstrap_provider.go similarity index 99% rename from internal/bootstrap/bootstrap_provider.go rename to pkg/bootstrap/bootstrap_provider.go index 229056af..1d27cce0 100644 --- a/internal/bootstrap/bootstrap_provider.go +++ b/pkg/bootstrap/bootstrap_provider.go @@ -29,8 +29,8 @@ import ( "github.com/fluxcd/go-git-providers/gitprovider" - "github.com/fluxcd/flux2/internal/bootstrap/git" - "github.com/fluxcd/flux2/internal/bootstrap/provider" + "github.com/fluxcd/flux2/pkg/bootstrap/git" + "github.com/fluxcd/flux2/pkg/bootstrap/provider" "github.com/fluxcd/flux2/pkg/manifestgen/sourcesecret" "github.com/fluxcd/flux2/pkg/manifestgen/sync" ) diff --git a/internal/bootstrap/git/commit_options.go b/pkg/bootstrap/git/commit_options.go similarity index 100% rename from internal/bootstrap/git/commit_options.go rename to pkg/bootstrap/git/commit_options.go diff --git a/internal/bootstrap/git/git.go b/pkg/bootstrap/git/git.go similarity index 100% rename from internal/bootstrap/git/git.go rename to pkg/bootstrap/git/git.go diff --git a/internal/bootstrap/git/gogit/gogit.go b/pkg/bootstrap/git/gogit/gogit.go similarity index 99% rename from internal/bootstrap/git/gogit/gogit.go rename to pkg/bootstrap/git/gogit/gogit.go index 5525aeff..559633b5 100644 --- a/internal/bootstrap/git/gogit/gogit.go +++ b/pkg/bootstrap/git/gogit/gogit.go @@ -32,7 +32,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/object" "github.com/go-git/go-git/v5/plumbing/transport" - "github.com/fluxcd/flux2/internal/bootstrap/git" + "github.com/fluxcd/flux2/pkg/bootstrap/git" ) type GoGit struct { diff --git a/internal/bootstrap/git/gogit/gogit_test.go b/pkg/bootstrap/git/gogit/gogit_test.go similarity index 96% rename from internal/bootstrap/git/gogit/gogit_test.go rename to pkg/bootstrap/git/gogit/gogit_test.go index 416898d1..02c5ea58 100644 --- a/internal/bootstrap/git/gogit/gogit_test.go +++ b/pkg/bootstrap/git/gogit/gogit_test.go @@ -6,7 +6,7 @@ package gogit import ( "testing" - "github.com/fluxcd/flux2/internal/bootstrap/git" + "github.com/fluxcd/flux2/pkg/bootstrap/git" ) func TestGetOpenPgpEntity(t *testing.T) { diff --git a/internal/bootstrap/git/gogit/testdata/private.key b/pkg/bootstrap/git/gogit/testdata/private.key similarity index 100% rename from internal/bootstrap/git/gogit/testdata/private.key rename to pkg/bootstrap/git/gogit/testdata/private.key diff --git a/internal/bootstrap/options.go b/pkg/bootstrap/options.go similarity index 98% rename from internal/bootstrap/options.go rename to pkg/bootstrap/options.go index 2d1f69b7..9dada56f 100644 --- a/internal/bootstrap/options.go +++ b/pkg/bootstrap/options.go @@ -21,7 +21,7 @@ import ( runclient "github.com/fluxcd/pkg/runtime/client" - "github.com/fluxcd/flux2/internal/bootstrap/git" + "github.com/fluxcd/flux2/pkg/bootstrap/git" "github.com/fluxcd/flux2/pkg/log" ) diff --git a/internal/bootstrap/provider/factory.go b/pkg/bootstrap/provider/factory.go similarity index 100% rename from internal/bootstrap/provider/factory.go rename to pkg/bootstrap/provider/factory.go diff --git a/internal/bootstrap/provider/provider.go b/pkg/bootstrap/provider/provider.go similarity index 100% rename from internal/bootstrap/provider/provider.go rename to pkg/bootstrap/provider/provider.go