fixup! Upgrade dependencies

plgd-dev · Sep 9, 2024 · 5ca4a1c · 5ca4a1c
1 parent fb3ee75
commit 5ca4a1c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,6 +14,7 @@
         "MFG_CLIENT_APPLICATION_KEY": "${workspaceFolder}/.tmp/devsim/pki_certs/mfgclientapplicationkey.pem",
         "TEST_OAUTH_SERVER_ID_TOKEN_PRIVATE_KEY": "${workspaceFolder}/.tmp/oauth-server/idTokenKey.pem",
         "TEST_OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY": "${workspaceFolder}/.tmp/oauth-server/accessTokenKey.pem",
+        "M2M_OAUTH_SERVER_PRIVATE_KEY": "${workspaceFolder}/.tmp/oauth-server/m2mAccessTokenKey.pem",
         "TEST_ROOT_CA_KEY": "${workspaceFolder}/.tmp/certs/rootcakey.pem",
         "TEST_ROOT_CA_CERT": "${workspaceFolder}/.tmp/certs/rootcacrt.pem",
         "TEST_CLOUD_SID": "adebc667-1f2b-41e3-bf5c-6d6eabc68cc6",
@@ -31,6 +32,6 @@
     ],
     "go.useLanguageServer": true,
     "gopls": {
-	    "formatting.gofumpt": true,
+        "formatting.gofumpt": true,
     },
 }
diff --git a/Makefile b/Makefile
@@ -25,6 +25,7 @@ UI_SEPARATOR ?= "--------UI--------"
 OAUTH_SERVER_PATH = $(shell pwd)/.tmp/oauth-server
 OAUTH_SERVER_ID_TOKEN_PRIVATE_KEY = $(OAUTH_SERVER_PATH)/idTokenKey.pem
 OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY = $(OAUTH_SERVER_PATH)/accessTokenKey.pem
+M2M_OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY = $(OAUTH_SERVER_PATH)/m2mAccessTokenKey.pem
 CLOUD_SID = adebc667-1f2b-41e3-bf5c-6d6eabc68cc6
 
 certificates:
@@ -68,6 +69,8 @@ privateKeys:
 	mkdir -p $(OAUTH_SERVER_PATH)
 	openssl genrsa -out $(OAUTH_SERVER_ID_TOKEN_PRIVATE_KEY) 4096
 	openssl ecparam -name prime256v1 -genkey -noout -out $(OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY)
+	openssl ecparam -name prime256v1 -genkey -noout -out $(M2M_OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY)
+
 .PHONY: privateKeys
 
 env: clean certificates privateKeys nats mongo
@@ -119,6 +122,7 @@ test: env
 	export MFG_CLIENT_APPLICATION_KEY=$(MFG_CLIENT_APPLICATION_KEY); \
 	export TEST_OAUTH_SERVER_ID_TOKEN_PRIVATE_KEY=$(OAUTH_SERVER_ID_TOKEN_PRIVATE_KEY); \
 	export TEST_OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY=$(OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY); \
+	export M2M_OAUTH_SERVER_PRIVATE_KEY=$(M2M_OAUTH_SERVER_ACCESS_TOKEN_PRIVATE_KEY); \
 	export TEST_ROOT_CA_KEY=$(WORKING_DIRECTORY)/.tmp/certs/rootcakey.pem; \
 	export TEST_ROOT_CA_CERT=$(WORKING_DIRECTORY)/.tmp/certs/rootcacrt.pem; \
 	export TEST_COAP_GW_CERT_FILE=$(WORKING_DIRECTORY)/.tmp/certs/coap.crt; \

diff --git a/service/http/remoteInitialize_test.go b/service/http/remoteInitialize_test.go
@@ -150,7 +150,7 @@ func setupRemoteProvisioning(t *testing.T, services ...hubTestService.SetUpServi
 
 	var service hubTestService.SetUpServicesConfig
 	if len(services) == 0 {
-		service = hubTestService.SetUpServicesOAuth | hubTestService.SetUpServicesCertificateAuthority
+		service = hubTestService.SetUpServicesOAuth | hubTestService.SetUpServicesMachine2MachineOAuth | hubTestService.SetUpServicesCertificateAuthority
 	} else {
 		for _, s := range services {
 			service |= s