Move PipedPluginService definition to the under the pkg/plugin (#5468)

* Move the piped-plugin-service to under /pkg/plugin Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> * Fix import path Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]> --------- Signed-off-by: Shinnosuke Sawada-Dazai <[email protected]>
pipe-cd · Jan 7, 2025 · 48be6ed · 48be6ed
1 parent 7e0adab
commit 48be6ed
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 157 deletions.
diff --git a/pkg/app/pipedv1/cmd/piped/grpcapi/plugin_api.go b/pkg/app/pipedv1/cmd/piped/grpcapi/plugin_api.go
@@ -18,9 +18,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
 	"github.com/pipe-cd/pipecd/pkg/app/server/service/pipedservice"
 	config "github.com/pipe-cd/pipecd/pkg/configv1"
+	service "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice"
 
 	"go.uber.org/zap"
 	"google.golang.org/grpc"

diff --git a/pkg/plugin/logpersister/persister.go b/pkg/plugin/logpersister/persister.go
@@ -26,8 +26,8 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
-	"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
 	"github.com/pipe-cd/pipecd/pkg/model"
+	service "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice"
 )
 
 type apiClient interface {

diff --git a/pkg/plugin/logpersister/persister_test.go b/pkg/plugin/logpersister/persister_test.go
@@ -24,7 +24,7 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
 
-	"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
+	service "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice"
 )
 
 type fakeAPIClient struct {

diff --git a/pkg/plugin/pipedapi/client.go b/pkg/plugin/pipedapi/client.go
@@ -26,7 +26,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
+	service "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice"
 	"github.com/pipe-cd/pipecd/pkg/rpc/rpcclient"
 )
 

diff --git a/...p/pipedv1/cmd/piped/service/service.pb.go → pkg/plugin/pipedservice/service.pb.go b/...p/pipedv1/cmd/piped/service/service.pb.go → pkg/plugin/pipedservice/service.pb.go
diff --git a/.../cmd/piped/service/service.pb.validate.go → ...lugin/pipedservice/service.pb.validate.go b/.../cmd/piped/service/service.pb.validate.go → ...lugin/pipedservice/service.pb.validate.go
diff --git a/...p/pipedv1/cmd/piped/service/service.proto → pkg/plugin/pipedservice/service.proto b/...p/pipedv1/cmd/piped/service/service.proto → pkg/plugin/pipedservice/service.proto
@@ -15,7 +15,7 @@
 syntax = "proto3";
 
 package grpc.piped.service;
-option go_package = "github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service";
+option go_package = "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice";
 
 import "validate/validate.proto";
 import "pkg/model/logblock.proto";

diff --git a/...edv1/cmd/piped/service/service_grpc.pb.go → pkg/plugin/pipedservice/service_grpc.pb.go b/...edv1/cmd/piped/service/service_grpc.pb.go → pkg/plugin/pipedservice/service_grpc.pb.go
diff --git a/pkg/plugin/toolregistry/toolregistry.go b/pkg/plugin/toolregistry/toolregistry.go
@@ -17,7 +17,7 @@ package toolregistry
 import (
 	"context"
 
-	"github.com/pipe-cd/pipecd/pkg/app/pipedv1/cmd/piped/service"
+	service "github.com/pipe-cd/pipecd/pkg/plugin/pipedservice"
 )
 
 type ToolRegistry struct {

diff --git a/tool/codegen/codegen.sh b/tool/codegen/codegen.sh
@@ -21,7 +21,7 @@ goProtoDirs=(
   "pkg/app/helloworld/service"
   "pkg/plugin/api/v1alpha1/deployment"
   "pkg/plugin/api/v1alpha1/livestate"
-  "pkg/app/pipedv1/cmd/piped/service"
+  "pkg/plugin/pipedservice"
 )
 
 for dir in ${goProtoDirs[*]}; do