migrate protos (#439)

* remove clean command for protos

Signed-off-by: mikeee <[email protected]>

* delete internal protos

Signed-off-by: mikeee <[email protected]>

* migrate refs to 1.11.1-rc.2

Signed-off-by: mikeee <[email protected]>

* migrate metadata pb import

Signed-off-by: mikeee <[email protected]>

* bump imports (dapr 1.12.0-rc.4)

Signed-off-by: mikeee <[email protected]>

* fix wait test to allow more than one "client"

Signed-off-by: mikeee <[email protected]>

---------

Signed-off-by: mikeee <[email protected]>

Author: mikeee

Makefile

@@ -1,6 +1,5 @@
 RELEASE_VERSION  =v1.0.0-rc-3
 GDOC_PORT        =8888
-PROTO_ROOT       =https://raw.githubusercontent.com/dapr/dapr/master/dapr/proto/
 GO_COMPAT_VERSION=1.19
 
 .PHONY: all
@@ -38,12 +37,6 @@ tag: ## Creates release tag
 	git tag $(RELEASE_VERSION)
 	git push origin $(RELEASE_VERSION)
 
-.PHONY: clean
-clean: ## Cleans go and generated files in ./dapr/proto/
-	go clean
-	rm -fr ./dapr/proto/common/v1/*.pb.go
-	rm -fr ./dapr/proto/runtime/v1/*.pb.go
-
 .PHONY: help
 help: ## Display available commands
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk \

client/actor.go

@@ -22,10 +22,10 @@ import (
 
 	anypb "github.com/golang/protobuf/ptypes/any"
 
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 	"github.com/dapr/go-sdk/actor"
 	"github.com/dapr/go-sdk/actor/codec"
 	"github.com/dapr/go-sdk/actor/config"
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
 )
 
 const (

client/binding.go

@@ -18,7 +18,7 @@ import (
 	"errors"
 	"fmt"
 
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 // InvokeBindingRequest represents binding invocation request.

client/client.go

@@ -35,7 +35,7 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/protobuf/types/known/emptypb"
 
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 
 	// used to import codec implements.
 	_ "github.com/dapr/go-sdk/actor/codec/impl"

client/client_test.go

@@ -34,8 +34,8 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 	"google.golang.org/protobuf/types/known/anypb"
 
-	commonv1pb "github.com/dapr/go-sdk/dapr/proto/common/v1"
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	commonv1pb "github.com/dapr/dapr/pkg/proto/common/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 const (

client/configuration.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"io"
 
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 type ConfigurationItem struct {

client/crypto.go

@@ -22,8 +22,8 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/protobuf/proto"
 
-	commonv1pb "github.com/dapr/go-sdk/dapr/proto/common/v1"
-	runtimev1pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	commonv1pb "github.com/dapr/dapr/pkg/proto/common/v1"
+	runtimev1pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 // Encrypt data read from a stream, returning a readable stream that receives the encrypted data.

client/crypto_test.go

@@ -25,8 +25,8 @@ import (
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 
-	commonv1 "github.com/dapr/go-sdk/dapr/proto/common/v1"
-	runtimev1pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	commonv1 "github.com/dapr/dapr/pkg/proto/common/v1"
+	runtimev1pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 func TestEncrypt(t *testing.T) {

client/invoke.go

@@ -22,8 +22,8 @@ import (
 
 	anypb "github.com/golang/protobuf/ptypes/any"
 
-	v1 "github.com/dapr/go-sdk/dapr/proto/common/v1"
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	v1 "github.com/dapr/dapr/pkg/proto/common/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 // DataContent the service invocation content.

client/invoke_test.go

@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	v1 "github.com/dapr/go-sdk/dapr/proto/common/v1"
+	v1 "github.com/dapr/dapr/pkg/proto/common/v1"
 )
 
 type _testStructwithText struct {