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]>
dapr · Sep 26, 2023 · 5779353 · 5779353
1 parent e16e035
commit 5779353
Show file tree

Hide file tree

Showing 34 changed files with 67 additions and 13,855 deletions.
diff --git a/Makefile b/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 \

diff --git a/client/actor.go b/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 (

diff --git a/client/binding.go b/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.

diff --git a/client/client.go b/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"

diff --git a/client/client_test.go b/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 (

diff --git a/client/configuration.go b/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 {

diff --git a/client/crypto.go b/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.

diff --git a/client/crypto_test.go b/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) {

diff --git a/client/invoke.go b/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.

diff --git a/client/invoke_test.go b/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 {

diff --git a/client/lock.go b/client/lock.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"
 )
 
 // LockRequest is the lock request object.

diff --git a/client/lock_test.go b/client/lock_test.go
@@ -19,7 +19,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 const (

diff --git a/client/metadata.go b/client/metadata.go
@@ -7,7 +7,7 @@ import (
 
 	"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"
 )
 
 type GetMetadataResponse struct {

diff --git a/client/pubsub.go b/client/pubsub.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/google/uuid"
 
-	pb "github.com/dapr/go-sdk/dapr/proto/runtime/v1"
+	pb "github.com/dapr/dapr/pkg/proto/runtime/v1"
 )
 
 const (

diff --git a/client/secret.go b/client/secret.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"
 )
 
 // GetSecret retrieves preconfigured secret from specified store using key.

diff --git a/client/state.go b/client/state.go
@@ -21,8 +21,8 @@ import (
 
 	"github.com/golang/protobuf/ptypes/duration"
 
-	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"
 )
 
 const (

diff --git a/client/state_test.go b/client/state_test.go
@@ -20,7 +20,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"
 )
 
 const (

diff --git a/client/wait_test.go b/client/wait_test.go
@@ -135,7 +135,7 @@ func TestGrpcWaitUnresponsiveTcpServer(t *testing.T) {
 	err = client.Wait(ctx, waitTimeout)
 	assert.Error(t, err)
 	assert.Equal(t, errWaitTimedOut, err)
-	assert.Equal(t, uint64(1), atomic.LoadUint64(&server.nClientsSeen))
+	assert.GreaterOrEqual(t, atomic.LoadUint64(&server.nClientsSeen), uint64(1))
 }
 
 func TestGrpcWaitUnresponsiveUnixServer(t *testing.T) {
@@ -153,5 +153,5 @@ func TestGrpcWaitUnresponsiveUnixServer(t *testing.T) {
 	err = client.Wait(ctx, waitTimeout)
 	assert.Error(t, err)
 	assert.Equal(t, errWaitTimedOut, err)
-	assert.Equal(t, uint64(1), atomic.LoadUint64(&server.nClientsSeen))
+	assert.GreaterOrEqual(t, atomic.LoadUint64(&server.nClientsSeen), uint64(1))
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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 {
@@ Expand Down @@