Skip to content

Commit 3bd930b

Browse files
committed
gomod: introduce github.com/plgd-dev/hub/v2
fixing different version of golang package against GitHub tags
1 parent 61a8c16 commit 3bd930b

528 files changed

Lines changed: 2334 additions & 2325 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.codecov.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ignore:
22
- "bundle"
33
- "charts"
4+
- "v2"
45
- "http-gateway/grpc-websocket"
56
- "http-gateway/web"
67
- "**/main.go"

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
.gitignore
44
.travis.yml
55
.tmp
6+
v2
67
Makefile
78
Dockerfile
89
Dockerfile.test

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
debug
88
.tmp/
99
authsvc.db
10+
v2/
1011

1112
# Test binary, build with `go test -c`
1213
*.test

.vscode/settings.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,8 @@
2929
"go.testTimeout": "600s",
3030
"go.buildFlags": [
3131
// "-mod=vendor",
32-
]
32+
],
33+
"files.watcherExclude": {
34+
"**/plgd-dev/hub/v2/**": true
35+
}
3336
}

bundle/client/grpc/main.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ import (
1515
"google.golang.org/grpc/credentials"
1616

1717
"github.com/plgd-dev/go-coap/v2/message"
18-
pbGW "github.com/plgd-dev/hub/grpc-gateway/pb"
19-
"github.com/plgd-dev/hub/pkg/log"
20-
kitNetGrpc "github.com/plgd-dev/hub/pkg/net/grpc"
21-
"github.com/plgd-dev/hub/resource-aggregate/commands"
22-
"github.com/plgd-dev/hub/test/oauth-server/service"
23-
oauthTest "github.com/plgd-dev/hub/test/oauth-server/test"
24-
"github.com/plgd-dev/hub/test/oauth-server/uri"
18+
pbGW "github.com/plgd-dev/hub/v2/grpc-gateway/pb"
19+
"github.com/plgd-dev/hub/v2/pkg/log"
20+
kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
21+
"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
22+
"github.com/plgd-dev/hub/v2/test/oauth-server/service"
23+
oauthTest "github.com/plgd-dev/hub/v2/test/oauth-server/test"
24+
"github.com/plgd-dev/hub/v2/test/oauth-server/uri"
2525
"github.com/plgd-dev/kit/v2/codec/json"
2626
)
2727

bundle/client/ob/main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ import (
1414

1515
"github.com/plgd-dev/device/client"
1616
"github.com/plgd-dev/device/schema/device"
17-
capb "github.com/plgd-dev/hub/certificate-authority/pb"
18-
"github.com/plgd-dev/hub/grpc-gateway/pb"
19-
grpcCloud "github.com/plgd-dev/hub/pkg/net/grpc"
20-
"github.com/plgd-dev/hub/test/oauth-server/service"
21-
oauthTest "github.com/plgd-dev/hub/test/oauth-server/test"
22-
"github.com/plgd-dev/hub/test/oauth-server/uri"
17+
capb "github.com/plgd-dev/hub/v2/certificate-authority/pb"
18+
"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
19+
grpcCloud "github.com/plgd-dev/hub/v2/pkg/net/grpc"
20+
"github.com/plgd-dev/hub/v2/test/oauth-server/service"
21+
oauthTest "github.com/plgd-dev/hub/v2/test/oauth-server/test"
22+
"github.com/plgd-dev/hub/v2/test/oauth-server/uri"
2323
"github.com/plgd-dev/kit/v2/codec/json"
2424
"google.golang.org/grpc"
2525
"google.golang.org/grpc/credentials"

bundle/client/ob/ocfclient.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"github.com/plgd-dev/device/client"
1010
"github.com/plgd-dev/device/client/core"
1111
"github.com/plgd-dev/device/schema/acl"
12-
capb "github.com/plgd-dev/hub/certificate-authority/pb"
13-
"github.com/plgd-dev/hub/certificate-authority/signer"
14-
"github.com/plgd-dev/hub/grpc-gateway/pb"
15-
"github.com/plgd-dev/hub/pkg/log"
12+
capb "github.com/plgd-dev/hub/v2/certificate-authority/pb"
13+
"github.com/plgd-dev/hub/v2/certificate-authority/signer"
14+
"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
15+
"github.com/plgd-dev/hub/v2/pkg/log"
1616
"github.com/plgd-dev/kit/v2/security"
1717
)
1818

certificate-authority/cmd/service/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package main
33
import (
44
"context"
55

6-
"github.com/plgd-dev/hub/certificate-authority/service"
7-
"github.com/plgd-dev/hub/pkg/config"
8-
"github.com/plgd-dev/hub/pkg/log"
6+
"github.com/plgd-dev/hub/v2/certificate-authority/service"
7+
"github.com/plgd-dev/hub/v2/pkg/config"
8+
"github.com/plgd-dev/hub/v2/pkg/log"
99
)
1010

1111
func main() {

certificate-authority/pb/cert.pb.go

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

certificate-authority/pb/cert.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ syntax = "proto3";
22

33
package certificateauthority.pb;
44

5-
option go_package = "github.com/plgd-dev/hub/certificate-authority/pb;pb";
5+
option go_package = "github.com/plgd-dev/hub/v2/certificate-authority/pb;pb";
66

77
message SignCertificateRequest {
88
bytes certificate_signing_request = 1; // PEM format

0 commit comments

Comments
 (0)