gomod: introduce github.com/plgd-dev/hub/v2

fixing different version of golang package against GitHub tags
plgd-dev · Jan 12, 2022 · 3bd930b · 3bd930b
1 parent 61a8c16
commit 3bd930b
Show file tree

Hide file tree

Showing 528 changed files with 2,334 additions and 2,325 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -1,6 +1,7 @@
 ignore:
   - "bundle"
   - "charts"
+  - "v2"
   - "http-gateway/grpc-websocket"
   - "http-gateway/web"
   - "**/main.go"

diff --git a/.dockerignore b/.dockerignore
@@ -3,6 +3,7 @@
 .gitignore
 .travis.yml
 .tmp
+v2
 Makefile
 Dockerfile
 Dockerfile.test

diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 debug
 .tmp/
 authsvc.db
+v2/
 
 # Test binary, build with `go test -c`
 *.test

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -29,5 +29,8 @@
     "go.testTimeout": "600s",
     "go.buildFlags": [
         // "-mod=vendor",
-    ]
+    ],
+    "files.watcherExclude": {
+        "**/plgd-dev/hub/v2/**": true
+    }
 }
diff --git a/bundle/client/grpc/main.go b/bundle/client/grpc/main.go
@@ -15,13 +15,13 @@ import (
 	"google.golang.org/grpc/credentials"
 
 	"github.com/plgd-dev/go-coap/v2/message"
-	pbGW "github.com/plgd-dev/hub/grpc-gateway/pb"
-	"github.com/plgd-dev/hub/pkg/log"
-	kitNetGrpc "github.com/plgd-dev/hub/pkg/net/grpc"
-	"github.com/plgd-dev/hub/resource-aggregate/commands"
-	"github.com/plgd-dev/hub/test/oauth-server/service"
-	oauthTest "github.com/plgd-dev/hub/test/oauth-server/test"
-	"github.com/plgd-dev/hub/test/oauth-server/uri"
+	pbGW "github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	"github.com/plgd-dev/hub/v2/pkg/log"
+	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
+	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
+	"github.com/plgd-dev/hub/v2/test/oauth-server/service"
+	oauthTest "github.com/plgd-dev/hub/v2/test/oauth-server/test"
+	"github.com/plgd-dev/hub/v2/test/oauth-server/uri"
 	"github.com/plgd-dev/kit/v2/codec/json"
 )
 

diff --git a/bundle/client/ob/main.go b/bundle/client/ob/main.go
@@ -14,12 +14,12 @@ import (
 
 	"github.com/plgd-dev/device/client"
 	"github.com/plgd-dev/device/schema/device"
-	capb "github.com/plgd-dev/hub/certificate-authority/pb"
-	"github.com/plgd-dev/hub/grpc-gateway/pb"
-	grpcCloud "github.com/plgd-dev/hub/pkg/net/grpc"
-	"github.com/plgd-dev/hub/test/oauth-server/service"
-	oauthTest "github.com/plgd-dev/hub/test/oauth-server/test"
-	"github.com/plgd-dev/hub/test/oauth-server/uri"
+	capb "github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	grpcCloud "github.com/plgd-dev/hub/v2/pkg/net/grpc"
+	"github.com/plgd-dev/hub/v2/test/oauth-server/service"
+	oauthTest "github.com/plgd-dev/hub/v2/test/oauth-server/test"
+	"github.com/plgd-dev/hub/v2/test/oauth-server/uri"
 	"github.com/plgd-dev/kit/v2/codec/json"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

diff --git a/bundle/client/ob/ocfclient.go b/bundle/client/ob/ocfclient.go
@@ -9,10 +9,10 @@ import (
 	"github.com/plgd-dev/device/client"
 	"github.com/plgd-dev/device/client/core"
 	"github.com/plgd-dev/device/schema/acl"
-	capb "github.com/plgd-dev/hub/certificate-authority/pb"
-	"github.com/plgd-dev/hub/certificate-authority/signer"
-	"github.com/plgd-dev/hub/grpc-gateway/pb"
-	"github.com/plgd-dev/hub/pkg/log"
+	capb "github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/certificate-authority/signer"
+	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 	"github.com/plgd-dev/kit/v2/security"
 )
 

diff --git a/certificate-authority/cmd/service/main.go b/certificate-authority/cmd/service/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"context"
 
-	"github.com/plgd-dev/hub/certificate-authority/service"
-	"github.com/plgd-dev/hub/pkg/config"
-	"github.com/plgd-dev/hub/pkg/log"
+	"github.com/plgd-dev/hub/v2/certificate-authority/service"
+	"github.com/plgd-dev/hub/v2/pkg/config"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 )
 
 func main() {

diff --git a/certificate-authority/pb/cert.pb.go b/certificate-authority/pb/cert.pb.go
diff --git a/certificate-authority/pb/cert.proto b/certificate-authority/pb/cert.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package certificateauthority.pb;
 
-option go_package = "github.com/plgd-dev/hub/certificate-authority/pb;pb";
+option go_package = "github.com/plgd-dev/hub/v2/certificate-authority/pb;pb";
 
 message SignCertificateRequest {
     bytes certificate_signing_request = 1; // PEM format

diff --git a/certificate-authority/pb/service.proto b/certificate-authority/pb/service.proto
@@ -4,7 +4,7 @@ package certificateauthority.pb;
 
 import "github.com/plgd-dev/hub/certificate-authority/pb/cert.proto";
 
-option go_package = "github.com/plgd-dev/hub/certificate-authority/pb;pb";
+option go_package = "github.com/plgd-dev/hub/v2/certificate-authority/pb;pb";
 
 service CertificateAuthority {
   // SignIdentityCertificate sends a Identity Certificate Signing Request to the certificate authority 

diff --git a/certificate-authority/service/caApi.go b/certificate-authority/service/caApi.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/karrick/tparse/v2"
-	"github.com/plgd-dev/hub/certificate-authority/pb"
-	"github.com/plgd-dev/hub/pkg/net/grpc/server"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/pkg/net/grpc/server"
 	"github.com/plgd-dev/kit/v2/security"
 	"google.golang.org/grpc"
 )

diff --git a/certificate-authority/service/config.go b/certificate-authority/service/config.go
@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/karrick/tparse/v2"
-	"github.com/plgd-dev/hub/pkg/config"
-	"github.com/plgd-dev/hub/pkg/log"
-	"github.com/plgd-dev/hub/pkg/net/grpc/server"
+	"github.com/plgd-dev/hub/v2/pkg/config"
+	"github.com/plgd-dev/hub/v2/pkg/log"
+	"github.com/plgd-dev/hub/v2/pkg/net/grpc/server"
 )
 
 type Config struct {

diff --git a/certificate-authority/service/service.go b/certificate-authority/service/service.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/plgd-dev/hub/pkg/log"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 
-	"github.com/plgd-dev/hub/pkg/net/grpc/server"
-	"github.com/plgd-dev/hub/pkg/security/jwt/validator"
+	"github.com/plgd-dev/hub/v2/pkg/net/grpc/server"
+	"github.com/plgd-dev/hub/v2/pkg/security/jwt/validator"
 )
 
 type Service struct {

diff --git a/certificate-authority/service/signCertificate.go b/certificate-authority/service/signCertificate.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
-	"github.com/plgd-dev/hub/pkg/log"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 	"github.com/plgd-dev/kit/v2/security/signer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/certificate-authority/service/signCertificate_test.go b/certificate-authority/service/signCertificate_test.go
@@ -6,12 +6,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
-	kitNetGrpc "github.com/plgd-dev/hub/pkg/net/grpc"
-	"github.com/plgd-dev/hub/test"
-	testCfg "github.com/plgd-dev/hub/test/config"
-	oauthTest "github.com/plgd-dev/hub/test/oauth-server/test"
-	"github.com/plgd-dev/hub/test/service"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
+	"github.com/plgd-dev/hub/v2/test"
+	testCfg "github.com/plgd-dev/hub/v2/test/config"
+	oauthTest "github.com/plgd-dev/hub/v2/test/oauth-server/test"
+	"github.com/plgd-dev/hub/v2/test/service"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"

diff --git a/certificate-authority/service/signIdentityCertificate.go b/certificate-authority/service/signIdentityCertificate.go
@@ -3,8 +3,8 @@ package service
 import (
 	"context"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
-	"github.com/plgd-dev/hub/pkg/log"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 	"github.com/plgd-dev/kit/v2/security/signer"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

diff --git a/certificate-authority/service/signIdentityCertificate_test.go b/certificate-authority/service/signIdentityCertificate_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
 )
 
 func TestRequestHandlerSignIdentityCertificate(t *testing.T) {

diff --git a/certificate-authority/signer/basicCertificateSigner.go b/certificate-authority/signer/basicCertificateSigner.go
@@ -3,7 +3,7 @@ package signer
 import (
 	"context"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
 )
 
 type BasicCertificateSigner struct {

diff --git a/certificate-authority/signer/identityCertificateSigner.go b/certificate-authority/signer/identityCertificateSigner.go
@@ -3,7 +3,7 @@ package signer
 import (
 	"context"
 
-	"github.com/plgd-dev/hub/certificate-authority/pb"
+	"github.com/plgd-dev/hub/v2/certificate-authority/pb"
 )
 
 type IdentityCertificateSigner struct {

diff --git a/certificate-authority/test/service.go b/certificate-authority/test/service.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/plgd-dev/hub/certificate-authority/service"
-	"github.com/plgd-dev/hub/pkg/log"
-	"github.com/plgd-dev/hub/test/config"
+	"github.com/plgd-dev/hub/v2/certificate-authority/service"
+	"github.com/plgd-dev/hub/v2/pkg/log"
+	"github.com/plgd-dev/hub/v2/test/config"
 	"github.com/stretchr/testify/require"
 )
 

diff --git a/cloud2cloud-connector/cmd/service/main.go b/cloud2cloud-connector/cmd/service/main.go
@@ -3,9 +3,9 @@ package main
 import (
 	"context"
 
-	"github.com/plgd-dev/hub/cloud2cloud-connector/service"
-	"github.com/plgd-dev/hub/pkg/config"
-	"github.com/plgd-dev/hub/pkg/log"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/service"
+	"github.com/plgd-dev/hub/v2/pkg/config"
+	"github.com/plgd-dev/hub/v2/pkg/log"
 )
 
 func main() {

diff --git a/cloud2cloud-connector/service/addLinkedAccount.go b/cloud2cloud-connector/service/addLinkedAccount.go
@@ -10,8 +10,8 @@ import (
 
 	"github.com/gorilla/mux"
 	cache "github.com/plgd-dev/go-coap/v2/pkg/cache"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
-	"github.com/plgd-dev/hub/pkg/net/grpc"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
+	"github.com/plgd-dev/hub/v2/pkg/net/grpc"
 )
 
 type LinkedCloudHandler struct {

diff --git a/cloud2cloud-connector/service/addLinkedCloud.go b/cloud2cloud-connector/service/addLinkedCloud.go
@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/google/uuid"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/events"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/events"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
 	"github.com/plgd-dev/kit/v2/codec/json"
 )
 

diff --git a/cloud2cloud-connector/service/cache.go b/cloud2cloud-connector/service/cache.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
 	kitSync "github.com/plgd-dev/kit/v2/sync"
 )
 

diff --git a/cloud2cloud-connector/service/config.go b/cloud2cloud-connector/service/config.go
@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/plgd-dev/hub/pkg/config"
-	"github.com/plgd-dev/hub/pkg/log"
-	"github.com/plgd-dev/hub/pkg/mongodb"
-	grpcClient "github.com/plgd-dev/hub/pkg/net/grpc/client"
-	"github.com/plgd-dev/hub/pkg/net/listener"
-	"github.com/plgd-dev/hub/pkg/security/oauth2"
-	natsClient "github.com/plgd-dev/hub/resource-aggregate/cqrs/eventbus/nats/client"
+	"github.com/plgd-dev/hub/v2/pkg/config"
+	"github.com/plgd-dev/hub/v2/pkg/log"
+	"github.com/plgd-dev/hub/v2/pkg/mongodb"
+	grpcClient "github.com/plgd-dev/hub/v2/pkg/net/grpc/client"
+	"github.com/plgd-dev/hub/v2/pkg/net/listener"
+	"github.com/plgd-dev/hub/v2/pkg/security/oauth2"
+	natsClient "github.com/plgd-dev/hub/v2/resource-aggregate/cqrs/eventbus/nats/client"
 )
 
 // Config represents application configuration

diff --git a/cloud2cloud-connector/service/deleteLinkedAccount.go b/cloud2cloud-connector/service/deleteLinkedAccount.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 
 	"github.com/gorilla/mux"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
 	"github.com/plgd-dev/kit/v2/log"
 )
 

diff --git a/cloud2cloud-connector/service/deviceSubscription.go b/cloud2cloud-connector/service/deviceSubscription.go
@@ -8,10 +8,10 @@ import (
 
 	"github.com/google/uuid"
 	cache "github.com/plgd-dev/go-coap/v2/pkg/cache"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/events"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
-	kitHttp "github.com/plgd-dev/hub/pkg/net/http"
-	"github.com/plgd-dev/hub/resource-aggregate/commands"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/events"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
+	kitHttp "github.com/plgd-dev/hub/v2/pkg/net/http"
+	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	"github.com/plgd-dev/kit/v2/log"
 )
 

diff --git a/cloud2cloud-connector/service/deviceSubscriptionHandlers.go b/cloud2cloud-connector/service/deviceSubscriptionHandlers.go
@@ -7,13 +7,13 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
-	grpcClient "github.com/plgd-dev/hub/grpc-gateway/client"
-	"github.com/plgd-dev/hub/grpc-gateway/pb"
-	kitNetGrpc "github.com/plgd-dev/hub/pkg/net/grpc"
-	"github.com/plgd-dev/hub/resource-aggregate/cqrs/eventbus/nats/subscriber"
-	raEvents "github.com/plgd-dev/hub/resource-aggregate/events"
-	raService "github.com/plgd-dev/hub/resource-aggregate/service"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
+	grpcClient "github.com/plgd-dev/hub/v2/grpc-gateway/client"
+	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
+	"github.com/plgd-dev/hub/v2/resource-aggregate/cqrs/eventbus/nats/subscriber"
+	raEvents "github.com/plgd-dev/hub/v2/resource-aggregate/events"
+	raService "github.com/plgd-dev/hub/v2/resource-aggregate/service"
 	"github.com/plgd-dev/kit/v2/log"
 	kitSync "github.com/plgd-dev/kit/v2/sync"
 )

diff --git a/cloud2cloud-connector/service/devicesSubscription.go b/cloud2cloud-connector/service/devicesSubscription.go
@@ -7,10 +7,10 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/plgd-dev/go-coap/v2/pkg/cache"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/events"
-	"github.com/plgd-dev/hub/cloud2cloud-connector/store"
-	pbIS "github.com/plgd-dev/hub/identity-store/pb"
-	"github.com/plgd-dev/hub/resource-aggregate/commands"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/events"
+	"github.com/plgd-dev/hub/v2/cloud2cloud-connector/store"
+	pbIS "github.com/plgd-dev/hub/v2/identity-store/pb"
+	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	"github.com/plgd-dev/kit/v2/log"
 )