From a8527d24b5a2a4513caa9ac86c0ff6f56865c16d Mon Sep 17 00:00:00 2001 From: Khanh Tran <32532742+khanhtc1202@users.noreply.github.com> Date: Thu, 12 Dec 2024 16:59:54 +0700 Subject: [PATCH] Move toolregistry package to pkg/plugin (#5415) Signed-off-by: khanhtc1202 --- pkg/app/pipedv1/plugin/kubernetes/provider/helm_test.go | 2 +- pkg/app/pipedv1/plugin/kubernetes/provider/kustomize_test.go | 2 +- pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go | 2 +- pkg/app/pipedv1/plugin/kubernetes/server.go | 2 +- pkg/app/pipedv1/plugin/kubernetes/toolregistry/registry_test.go | 2 +- pkg/{app/pipedv1 => }/plugin/toolregistry/toolregistry.go | 0 .../plugin/toolregistry/toolregistrytest/toolregistrytest.go | 0 7 files changed, 5 insertions(+), 5 deletions(-) rename pkg/{app/pipedv1 => }/plugin/toolregistry/toolregistry.go (100%) rename pkg/{app/pipedv1 => }/plugin/toolregistry/toolregistrytest/toolregistrytest.go (100%) diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/helm_test.go b/pkg/app/pipedv1/plugin/kubernetes/provider/helm_test.go index b32a2152b3..c81b1dff11 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/helm_test.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/helm_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/toolregistry" - "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/toolregistry/toolregistrytest" + "github.com/pipe-cd/pipecd/pkg/plugin/toolregistry/toolregistrytest" ) func TestTemplateLocalChart(t *testing.T) { diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/kustomize_test.go b/pkg/app/pipedv1/plugin/kubernetes/provider/kustomize_test.go index 1ec350d999..e17896b658 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/kustomize_test.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/kustomize_test.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/toolregistry" - "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/toolregistry/toolregistrytest" + "github.com/pipe-cd/pipecd/pkg/plugin/toolregistry/toolregistrytest" ) func TestKustomizeTemplate(t *testing.T) { diff --git a/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go b/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go index 15f61719f7..24b825efb0 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go +++ b/pkg/app/pipedv1/plugin/kubernetes/provider/loader_test.go @@ -28,7 +28,7 @@ import ( "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/config" "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/toolregistry" - "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/toolregistry/toolregistrytest" + "github.com/pipe-cd/pipecd/pkg/plugin/toolregistry/toolregistrytest" ) func mustParseManifests(t *testing.T, data string) []Manifest { diff --git a/pkg/app/pipedv1/plugin/kubernetes/server.go b/pkg/app/pipedv1/plugin/kubernetes/server.go index 146232b281..9653dc7b01 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/server.go +++ b/pkg/app/pipedv1/plugin/kubernetes/server.go @@ -22,11 +22,11 @@ import ( "github.com/pipe-cd/pipecd/pkg/admin" "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/kubernetes/deployment" - "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/toolregistry" "github.com/pipe-cd/pipecd/pkg/cli" config "github.com/pipe-cd/pipecd/pkg/configv1" "github.com/pipe-cd/pipecd/pkg/plugin/logpersister" "github.com/pipe-cd/pipecd/pkg/plugin/pipedapi" + "github.com/pipe-cd/pipecd/pkg/plugin/toolregistry" "github.com/pipe-cd/pipecd/pkg/rpc" "github.com/pipe-cd/pipecd/pkg/version" "github.com/spf13/cobra" diff --git a/pkg/app/pipedv1/plugin/kubernetes/toolregistry/registry_test.go b/pkg/app/pipedv1/plugin/kubernetes/toolregistry/registry_test.go index 92f75f5789..cbeb5e395d 100644 --- a/pkg/app/pipedv1/plugin/kubernetes/toolregistry/registry_test.go +++ b/pkg/app/pipedv1/plugin/kubernetes/toolregistry/registry_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pipe-cd/pipecd/pkg/app/pipedv1/plugin/toolregistry/toolregistrytest" + "github.com/pipe-cd/pipecd/pkg/plugin/toolregistry/toolregistrytest" ) func TestRegistry_Kubectl(t *testing.T) { diff --git a/pkg/app/pipedv1/plugin/toolregistry/toolregistry.go b/pkg/plugin/toolregistry/toolregistry.go similarity index 100% rename from pkg/app/pipedv1/plugin/toolregistry/toolregistry.go rename to pkg/plugin/toolregistry/toolregistry.go diff --git a/pkg/app/pipedv1/plugin/toolregistry/toolregistrytest/toolregistrytest.go b/pkg/plugin/toolregistry/toolregistrytest/toolregistrytest.go similarity index 100% rename from pkg/app/pipedv1/plugin/toolregistry/toolregistrytest/toolregistrytest.go rename to pkg/plugin/toolregistry/toolregistrytest/toolregistrytest.go