fixup! snippet-service: add ResourceChanged event subscription

plgd-dev · Jun 12, 2024 · 2467abf · 2467abf
1 parent 61ae294
commit 2467abf
Show file tree

Hide file tree

Showing 34 changed files with 636 additions and 262 deletions.
diff --git a/cloud2cloud-gateway/test/test.go b/cloud2cloud-gateway/test/test.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/tls"
 	"net"
+	"slices"
 	"sync"
 	"testing"
 	"time"
@@ -15,7 +16,6 @@ import (
 	"github.com/plgd-dev/hub/v2/pkg/mongodb"
 	"github.com/plgd-dev/hub/v2/pkg/net/http"
 	"github.com/plgd-dev/hub/v2/pkg/security/certManager/server"
-	pkgStrings "github.com/plgd-dev/hub/v2/pkg/strings"
 	"github.com/plgd-dev/hub/v2/test/config"
 	testHttp "github.com/plgd-dev/hub/v2/test/http"
 	"github.com/stretchr/testify/require"
@@ -98,7 +98,7 @@ func C2CURI(uri string) string {
 func GetUniqueSubscriptionID(subIDS ...string) string {
 	id := uuid.NewString()
 	for {
-		if !pkgStrings.Contains(subIDS, id) {
+		if !slices.Contains(subIDS, id) {
 			break
 		}
 		id = uuid.NewString()

diff --git a/coap-gateway/service/clientObserveHandler.go b/coap-gateway/service/clientObserveHandler.go
@@ -6,6 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 	"sync"
 	"sync/atomic"
 
@@ -17,7 +18,6 @@ import (
 	"github.com/plgd-dev/hub/v2/coap-gateway/service/message"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/subscription"
-	"github.com/plgd-dev/hub/v2/pkg/strings"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/events"
 )
@@ -119,7 +119,7 @@ func (s *resourceSubscription) isDuplicateEvent(ev *events.ResourceChanged) bool
 func (s *resourceSubscription) eventHandler(e *pb.Event) error {
 	switch {
 	case e.GetResourceUnpublished() != nil:
-		if !strings.Contains(e.GetResourceUnpublished().GetHrefs(), s.href) {
+		if !slices.Contains(e.GetResourceUnpublished().GetHrefs(), s.href) {
 			return nil
 		}
 		s.cancelSubscription(coapCodes.ServiceUnavailable)

diff --git a/coap-gateway/service/observation/deviceObserver.go b/coap-gateway/service/observation/deviceObserver.go
@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"slices"
 
 	"github.com/plgd-dev/device/v2/schema"
 	"github.com/plgd-dev/device/v2/schema/interfaces"
@@ -16,7 +17,6 @@ import (
 	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
 	"github.com/plgd-dev/hub/v2/pkg/log"
 	"github.com/plgd-dev/hub/v2/pkg/net/coap"
-	pkgStrings "github.com/plgd-dev/hub/v2/pkg/strings"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	pbRD "github.com/plgd-dev/hub/v2/resource-directory/pb"
 	"google.golang.org/grpc"
@@ -308,7 +308,7 @@ func IsDiscoveryResourceObservable(links schema.ResourceLinks) (bool, error) {
 		return observable, nil
 	}
 
-	return pkgStrings.Contains(res.Interfaces, observeInterface), nil
+	return slices.Contains(res.Interfaces, observeInterface), nil
 }
 
 func detectObservationType(links schema.ResourceLinks) (ObservationType, error) {

diff --git a/coap-gateway/service/signIn.go b/coap-gateway/service/signIn.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"slices"
 	"time"
 
 	"github.com/plgd-dev/go-coap/v3/message"
@@ -14,7 +15,6 @@ import (
 	grpcgwClient "github.com/plgd-dev/hub/v2/grpc-gateway/client"
 	"github.com/plgd-dev/hub/v2/identity-store/events"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
-	"github.com/plgd-dev/hub/v2/pkg/strings"
 	pkgTime "github.com/plgd-dev/hub/v2/pkg/time"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	"github.com/plgd-dev/kit/v2/codec/cbor"
@@ -173,7 +173,7 @@ func subscribeToDeviceEvents(client *session, owner, deviceID string) error {
 		if evt.GetOwner() != owner {
 			return
 		}
-		if !strings.Contains(evt.GetDeviceIds(), deviceID) {
+		if !slices.Contains(evt.GetDeviceIds(), deviceID) {
 			return
 		}
 		client.Close()

diff --git a/grpc-gateway/client/client_test.go b/grpc-gateway/client/client_test.go
@@ -2,21 +2,16 @@ package client_test
 
 import (
 	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"testing"
 
 	"github.com/plgd-dev/device/v2/schema/device"
 	"github.com/plgd-dev/go-coap/v3/message"
-	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
 	"github.com/plgd-dev/hub/v2/pkg/net/grpc/server"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/events"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
 	"github.com/plgd-dev/kit/v2/codec/cbor"
-	"github.com/stretchr/testify/require"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
@@ -26,22 +21,6 @@ const (
 	TestManufacturer = "Test Manufacturer"
 )
 
-func NewTestClient(t *testing.T) *client.Client {
-	rootCAs := x509.NewCertPool()
-	for _, c := range test.GetRootCertificateAuthorities(t) {
-		rootCAs.AddCert(c)
-	}
-	tlsCfg := tls.Config{
-		RootCAs: rootCAs,
-	}
-	clientConfig := client.Config{
-		GatewayAddress: config.GRPC_GW_HOST,
-	}
-	c, err := client.NewFromConfig(&clientConfig, &tlsCfg)
-	require.NoError(t, err)
-	return c
-}
-
 func NewGateway(addr string) (*server.Server, error) {
 	s, err := server.NewServer(addr)
 	if err != nil {

diff --git a/grpc-gateway/client/createResource_test.go b/grpc-gateway/client/createResource_test.go
@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"github.com/plgd-dev/device/v2/schema/device"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -67,7 +68,7 @@ func TestClient_CreateResource(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/deleteResource_test.go b/grpc-gateway/client/deleteResource_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/plgd-dev/device/v2/schema/resources"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
 	extCodes "github.com/plgd-dev/hub/v2/grpc-gateway/pb/codes"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -83,7 +84,7 @@ func TestClientDeleteResource(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)
@@ -172,7 +173,7 @@ func TestClientBatchDeleteResource(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/deviceSubscriptions_test.go b/grpc-gateway/client/deviceSubscriptions_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/plgd-dev/device/v2/schema/platform"
 	"github.com/plgd-dev/go-coap/v3/message"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	"github.com/plgd-dev/hub/v2/pkg/fsnotify"
 	"github.com/plgd-dev/hub/v2/pkg/log"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
@@ -82,7 +83,7 @@ func TestObserveDeviceResourcesRetrieve(t *testing.T) {
 	}()
 	rac := raservice.NewResourceAggregateClient(raConn.GRPC())
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		errC := c.Close()
 		require.NoError(t, errC)
@@ -177,7 +178,7 @@ func TestObserveDeviceResourcesUpdate(t *testing.T) {
 	}()
 	rac := raservice.NewResourceAggregateClient(raConn.GRPC())
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		errC := c.Close()
 		require.NoError(t, errC)
@@ -306,7 +307,7 @@ func TestObserveDeviceResourcesCreateAndDelete(t *testing.T) {
 	}()
 	rac := raservice.NewResourceAggregateClient(raConn.GRPC())
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		errC := c.Close()
 		require.NoError(t, errC)

diff --git a/grpc-gateway/client/getDevice_test.go b/grpc-gateway/client/getDevice_test.go
@@ -10,6 +10,7 @@ import (
 	"github.com/plgd-dev/device/v2/test/resource/types"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/pb"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/commands"
 	test "github.com/plgd-dev/hub/v2/test"
@@ -92,7 +93,7 @@ func TestClient_GetDevice(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/getDevices_test.go b/grpc-gateway/client/getDevices_test.go
@@ -6,6 +6,7 @@ import (
 	"time"
 
 	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	test "github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -69,7 +70,7 @@ func TestClient_GetDevices(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/getResource_test.go b/grpc-gateway/client/getResource_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/plgd-dev/device/v2/schema/configuration"
 	"github.com/plgd-dev/device/v2/schema/interfaces"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -100,7 +101,7 @@ func TestClientGetResource(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/maintenance.go b/grpc-gateway/client/maintenance.go
@@ -3,10 +3,10 @@ package client
 import (
 	"context"
 	"net/http"
+	"slices"
 
 	"github.com/plgd-dev/device/v2/schema/maintenance"
 	"github.com/plgd-dev/hub/v2/pkg/net/grpc"
-	"github.com/plgd-dev/hub/v2/pkg/strings"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/events"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -65,7 +65,7 @@ func (c *Client) updateMaintenanceResource(
 	}
 	var href string
 	for _, r := range v.GetResources() {
-		if r.GetDeviceId() == deviceID && strings.Contains(r.GetResourceTypes(), maintenance.ResourceType) {
+		if r.GetDeviceId() == deviceID && slices.Contains(r.GetResourceTypes(), maintenance.ResourceType) {
 			href = r.GetHref()
 			break
 		}

diff --git a/grpc-gateway/client/maintenance_test.go b/grpc-gateway/client/maintenance_test.go
@@ -5,6 +5,7 @@ import (
 	"testing"
 	"time"
 
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	test "github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -50,7 +51,7 @@ func TestClientFactoryReset(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)
@@ -104,7 +105,7 @@ func TestClientReboot(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/observeDeviceResources_test.go b/grpc-gateway/client/observeDeviceResources_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 	"time"
 
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/resource-aggregate/events"
 	test "github.com/plgd-dev/hub/v2/test"
@@ -24,7 +25,7 @@ func TestObserveDeviceResourcesPublish(t *testing.T) {
 	defer tearDown()
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/observeDevices_test.go b/grpc-gateway/client/observeDevices_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	client "github.com/plgd-dev/hub/v2/grpc-gateway/client"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -23,7 +24,7 @@ func TestObserveDevices(t *testing.T) {
 	defer tearDown()
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)

diff --git a/grpc-gateway/client/observeResource_test.go b/grpc-gateway/client/observeResource_test.go
@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/plgd-dev/device/v2/schema/configuration"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -25,7 +26,7 @@ func TestObservingResource(t *testing.T) {
 	defer tearDown()
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		errC := c.Close()
 		require.NoError(t, errC)

diff --git a/grpc-gateway/client/updateResource_test.go b/grpc-gateway/client/updateResource_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/plgd-dev/device/v2/schema/configuration"
 	"github.com/plgd-dev/device/v2/schema/interfaces"
 	"github.com/plgd-dev/hub/v2/grpc-gateway/client"
+	grpcgwTest "github.com/plgd-dev/hub/v2/grpc-gateway/test"
 	kitNetGrpc "github.com/plgd-dev/hub/v2/pkg/net/grpc"
 	"github.com/plgd-dev/hub/v2/test"
 	"github.com/plgd-dev/hub/v2/test/config"
@@ -94,7 +95,7 @@ func TestClientUpdateResource(t *testing.T) {
 
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		errC := c.Close()
 		require.NoError(t, errC)
@@ -131,7 +132,7 @@ func TestUpdateConfigurationName(t *testing.T) {
 	defer tearDown()
 	ctx = kitNetGrpc.CtxWithToken(ctx, oauthTest.GetDefaultAccessToken(t))
 
-	c := NewTestClient(t)
+	c := grpcgwTest.NewTestClient(t)
 	defer func() {
 		err := c.Close()
 		require.NoError(t, err)