Don't move velero v1 plugins to new proto dir

To preserve backwards compatibility, don't move velero v1 plugins to new proto dir. Signed-off-by: Scott Seago <[email protected]>
vmware-tanzu · Aug 30, 2022 · f53b6d8 · f53b6d8
1 parent 94a9a7c
commit f53b6d8
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 120 deletions.
diff --git a/hack/update-2proto.sh b/hack/update-2proto.sh
@@ -20,6 +20,5 @@ echo "Updating plugin proto"
 
 echo protoc --version
 protoc pkg/plugin/proto/*.proto --go_out=plugins=grpc:pkg/plugin/generated/ --go_opt=module=github.com/vmware-tanzu/velero/pkg/plugin/generated -I pkg/plugin/proto/
-protoc pkg/plugin/proto/backupitemaction/v1/*.proto --go_out=plugins=grpc:pkg/plugin/generated/ --go_opt=module=github.com/vmware-tanzu/velero/pkg/plugin/generated -I pkg/plugin/proto/
 
 echo "Updating plugin proto - done!"
diff --git a/pkg/plugin/framework/backup_item_action.go b/pkg/plugin/framework/backup_item_action.go
@@ -21,7 +21,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 
-	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v1"
+	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated"
 )
 
 // BackupItemActionPlugin is an implementation of go-plugin's Plugin

diff --git a/pkg/plugin/framework/backup_item_action_client.go b/pkg/plugin/framework/backup_item_action_client.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
-	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v1"
+	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
 )
 

diff --git a/pkg/plugin/framework/backup_item_action_server.go b/pkg/plugin/framework/backup_item_action_server.go
@@ -25,7 +25,7 @@ import (
 
 	api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	proto "github.com/vmware-tanzu/velero/pkg/plugin/generated"
-	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v1"
+	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
 	biav1 "github.com/vmware-tanzu/velero/pkg/plugin/velero/backupitemaction/v1"
 )

diff --git a/pkg/plugin/framework/backup_item_action_test.go b/pkg/plugin/framework/backup_item_action_test.go
@@ -31,7 +31,7 @@ import (
 	v1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
 	"github.com/vmware-tanzu/velero/pkg/backup/mocks"
 	proto "github.com/vmware-tanzu/velero/pkg/plugin/generated"
-	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v1"
+	protobiav1 "github.com/vmware-tanzu/velero/pkg/plugin/generated"
 	"github.com/vmware-tanzu/velero/pkg/plugin/velero"
 	velerotest "github.com/vmware-tanzu/velero/pkg/test"
 )

diff --git a/...ackupitemaction/v1/BackupItemAction.pb.go → pkg/plugin/generated/BackupItemAction.pb.go b/...ackupitemaction/v1/BackupItemAction.pb.go → pkg/plugin/generated/BackupItemAction.pb.go
diff --git a/...ackupitemaction/v1/BackupItemAction.proto → pkg/plugin/proto/BackupItemAction.proto b/...ackupitemaction/v1/BackupItemAction.proto → pkg/plugin/proto/BackupItemAction.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
-package v1;
-option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated/backupitemaction/v1";
+package generated;
+option go_package = "github.com/vmware-tanzu/velero/pkg/plugin/generated";
 
 import "Shared.proto";
 
@@ -12,7 +12,7 @@ message ExecuteRequest {
 
 message ExecuteResponse {
     bytes item = 1;
-    repeated generated.ResourceIdentifier additionalItems = 2;
+    repeated ResourceIdentifier additionalItems = 2;
 }
 
 service BackupItemAction {
@@ -25,5 +25,5 @@ message BackupItemActionAppliesToRequest {
 }
 
 message BackupItemActionAppliesToResponse {
-    generated.ResourceSelector ResourceSelector = 1;
+    ResourceSelector ResourceSelector = 1;
 }