Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename cloud to hub #501

Merged
merged 8 commits into from
Oct 7, 2021
Merged

Rename cloud to hub #501

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c10d42
introduce main branch with cloud@v2
jkralik Oct 6, 2021
2fba2e7
http-gateway: remove default value for.ui.webConfiguration.deviceOAut…
jkralik Oct 6, 2021
cec8c85
upgrade modules
jkralik Oct 6, 2021
ea3d84a
fixup! introduce main branch with cloud@v2
jkralik Oct 7, 2021
b534bc4
fixup! introduce main branch with cloud@v2
jkralik Oct 7, 2021
7ff42a4
fixup! introduce main branch with cloud@v2
jkralik Oct 7, 2021
d8a7575
fixup! introduce main branch with cloud@v2
jkralik Oct 7, 2021
7b28f52
update charts
jkralik Oct 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! introduce main branch with cloud@v2
  • Loading branch information
@jkralik
jkralik committed Oct 7, 2021
commit 7ff42a483a9faaef86788752265b718c2bbb242b
2 changes: 1 addition & 1 deletion cloud2cloud-connector/events/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package events

import (
"github.com/plgd-dev/sdk/v2/schema"
"github.com/plgd-dev/device/schema"
)

type ResourcesPublished []schema.ResourceLink
Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-connector/service/publishResource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
kitHttp "github.com/plgd-dev/cloud/v2/pkg/net/http"
"github.com/plgd-dev/cloud/v2/resource-aggregate/commands"
raService "github.com/plgd-dev/cloud/v2/resource-aggregate/service"
"github.com/plgd-dev/sdk/v2/schema"
"github.com/plgd-dev/device/schema"
)

func publishResource(ctx context.Context, raClient raService.ResourceAggregateClient, link schema.ResourceLink, cmdMetadata *commands.CommandMetadata) error {
Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-connector/service/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"github.com/plgd-dev/cloud/v2/pkg/security/oauth2"
"github.com/plgd-dev/cloud/v2/resource-aggregate/commands"
raService "github.com/plgd-dev/cloud/v2/resource-aggregate/service"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/kit/v2/codec/json"
"github.com/plgd-dev/kit/v2/log"
"github.com/plgd-dev/sdk/v2/schema"
)

type Device struct {
Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-gateway/service/deviceSubscriptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/plgd-dev/cloud/v2/cloud2cloud-connector/events"
raEvents "github.com/plgd-dev/cloud/v2/resource-aggregate/events"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/kit/v2/log"
"github.com/plgd-dev/sdk/v2/schema"
)

type deviceSubscriptionHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-gateway/service/retrieveDevice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (

"github.com/gorilla/mux"
kitNetHttp "github.com/plgd-dev/cloud/v2/pkg/net/http"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/go-coap/v2/message"
"github.com/plgd-dev/kit/v2/codec/cbor"
"github.com/plgd-dev/kit/v2/codec/json"
"github.com/plgd-dev/kit/v2/log"
"github.com/plgd-dev/sdk/v2/schema"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"

Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-gateway/service/retrieveDevices.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/gorilla/mux"
pbGRPC "github.com/plgd-dev/cloud/v2/grpc-gateway/pb"
kitNetHttp "github.com/plgd-dev/cloud/v2/pkg/net/http"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/kit/v2/log"
"github.com/plgd-dev/sdk/v2/schema"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
Expand Down
2 changes: 1 addition & 1 deletion cloud2cloud-gateway/service/subscribeToDevice_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"github.com/plgd-dev/cloud/v2/test"
testCfg "github.com/plgd-dev/cloud/v2/test/config"
oauthTest "github.com/plgd-dev/cloud/v2/test/oauth-server/test"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/go-coap/v2/message"
"github.com/plgd-dev/kit/v2/codec/json"
"github.com/plgd-dev/sdk/v2/schema"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"google.golang.org/grpc"
Expand Down
2 changes: 1 addition & 1 deletion coap-gateway/service/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/plgd-dev/cloud/v2/coap-gateway/uri"
"github.com/plgd-dev/cloud/v2/pkg/net/grpc"
pkgJwt "github.com/plgd-dev/cloud/v2/pkg/security/jwt"
"github.com/plgd-dev/device/pkg/net/coap"
"github.com/plgd-dev/go-coap/v2/message/codes"
"github.com/plgd-dev/sdk/v2/pkg/net/coap"
)

type Interceptor = func(ctx context.Context, code codes.Code, path string) (context.Context, error)
Expand Down
2 changes: 1 addition & 1 deletion coap-gateway/service/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ import (
pkgJwt "github.com/plgd-dev/cloud/v2/pkg/security/jwt"
"github.com/plgd-dev/cloud/v2/resource-aggregate/commands"
"github.com/plgd-dev/cloud/v2/resource-aggregate/events"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/go-coap/v2/message"
"github.com/plgd-dev/go-coap/v2/message/codes"
"github.com/plgd-dev/go-coap/v2/tcp"
"github.com/plgd-dev/go-coap/v2/tcp/message/pool"
kitSync "github.com/plgd-dev/kit/v2/sync"
"github.com/plgd-dev/sdk/v2/schema"
)

const OCFBaselineInterface = "oic.if.baseline"
Expand Down
2 changes: 1 addition & 1 deletion coap-gateway/service/resourceDirectory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import (
"strings"

"github.com/plgd-dev/cloud/v2/coap-gateway/coapconv"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/go-coap/v2/message"
coapCodes "github.com/plgd-dev/go-coap/v2/message/codes"
"github.com/plgd-dev/go-coap/v2/mux"
"github.com/plgd-dev/kit/v2/codec/cbor"
"github.com/plgd-dev/sdk/v2/schema"
)

type wkRd struct {
Expand Down
2 changes: 1 addition & 1 deletion coap-gateway/service/resourceDiscovery.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (
pbGRPC "github.com/plgd-dev/cloud/v2/grpc-gateway/pb"
"github.com/plgd-dev/cloud/v2/pkg/log"
"github.com/plgd-dev/cloud/v2/resource-aggregate/commands"
"github.com/plgd-dev/device/schema"
"github.com/plgd-dev/go-coap/v2/message"
coapCodes "github.com/plgd-dev/go-coap/v2/message/codes"
"github.com/plgd-dev/go-coap/v2/mux"
"github.com/plgd-dev/sdk/v2/schema"
)

func makeListDevicesCommand(msg *mux.Message) (*pbGRPC.GetResourceLinksRequest, error) {
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ require (
github.com/jtacoma/uritemplates v1.0.0
github.com/karrick/tparse/v2 v2.8.2
github.com/lestrrat-go/jwx v1.2.7
github.com/nats-io/nats-server/v2 v2.6.1 // indirect
github.com/nats-io/nats.go v1.12.3
github.com/panjf2000/ants/v2 v2.4.6
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/plgd-dev/device v0.0.0-20211007111308-ff0c9349c2b8
github.com/plgd-dev/go-coap/v2 v2.4.1-0.20211006194403-5081d8da41f9
github.com/plgd-dev/kit/v2 v2.0.0-20211006190727-057b33161b90
github.com/plgd-dev/sdk/v2 v2.0.0-20211006195827-30b6744a07e8
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
go.mongodb.org/mongo-driver v1.7.3
Expand Down
Loading