Merge pull request #4444 from hashicorp/make-docker/gen/plugins

New make command to generate plugin protos with docker

Author: izaaklauer

Makefile

@@ -86,6 +86,11 @@ docker/gen/server: docker/tools
 	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
 	docker run -v `pwd`:/waypoint -it docker.io/library/waypoint-tools:dev make gen/server
 
+.PHONY: docker/gen/plugins
+docker/gen/plugins: docker/tools
+	@test -s "thirdparty/proto/api-common-protos/.git" || { echo "git submodules not initialized, run 'git submodule update --init --recursive' and try again"; exit 1; }
+	docker run -v `pwd`:/waypoint -it docker.io/library/waypoint-tools:dev make gen/plugins
+
 # expected to be invoked by make gen/changelog LAST_RELEASE=gitref THIS_RELEASE=gitref
 .PHONY: gen/changelog
 gen/changelog: # Generates the changelog for Waypoint

builtin/aws/alb/main.go

@@ -4,7 +4,7 @@ import (
 	sdk "github.com/hashicorp/waypoint-plugin-sdk"
 )
 
-//go:generate protoc -I ../../../.. -I ../../../thirdparty/proto --go_opt=plugins=grpc --go_out=../../../.. waypoint/builtin/aws/alb/plugin.proto
+//go:generate protoc -I ../../../.. -I ../../../thirdparty/proto --go_out=../../../.. --go-grpc_out=../../../.. waypoint/builtin/aws/alb/plugin.proto
 
 // Options are the SDK options to use for instantiation.
 var Options = []sdk.Option{

builtin/aws/alb/plugin.pb.go

@@ -23,6 +23,9 @@ message Release {
 message Resource {
   message SecurityGroup {
     string id = 1;
+    // Indicates that this resource has been created by and is owned by waypoint
+    // (and is therefore safe for waypoint to delete during a project destroy)
+    bool managed = 2;
   }
 
   message LoadBalancer {

builtin/aws/alb/plugin.proto

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/waypoint-plugin-sdk"
 )
 
-//go:generate protoc -I ../../../.. --go_opt=plugins=grpc --go_out=../../../.. waypoint/builtin/aws/ami/plugin.proto
+//go:generate protoc -I ../../../.. --go_out=../../../.. --go-grpc_out=../../../.. waypoint/builtin/aws/ami/plugin.proto
 
 // Options are the SDK options to use for instantiation.
 var Options = []sdk.Option{

builtin/aws/ami/main.go

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/waypoint-plugin-sdk"
 )
 
-//go:generate protoc -I ../../../.. --go_opt=plugins=grpc --go_out=../../../.. waypoint/builtin/aws/ec2/plugin.proto
+//go:generate protoc -I ../../../.. --go_out=../../../.. --go-grpc_out=../../../.. waypoint/builtin/aws/ec2/plugin.proto
 
 // Options are the SDK options to use for instantiation.
 var Options = []sdk.Option{

builtin/aws/ami/plugin.pb.go

@@ -4,7 +4,7 @@ import (
 	"github.com/hashicorp/waypoint-plugin-sdk"
 )
 
-//go:generate protoc -I ../../../.. --go_opt=plugins=grpc --go_out=../../../.. waypoint/builtin/aws/ecr/plugin.proto
+//go:generate protoc -I ../../../.. --go_out=../../../.. --go-grpc_out=../../../.. waypoint/builtin/aws/ecr/plugin.proto
 
 // Options are the SDK options to use for instantiation.
 var Options = []sdk.Option{