Merge branch 'master-mirror' into BOOST-730-implement-azure-resources

# Conflicts:
#	packages/framework-provider-azure-infrastructure/package.json
#	packages/framework-provider-azure/package.json

lerna.json

@@ -13,7 +13,7 @@
     "packages/cli",
     "packages/framework-integration-tests"
   ],
-  "version": "0.5.0",
+  "version": "0.5.1",
   "npmClient": "yarn",
   "useWorkspaces": true
 }

packages/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@boostercloud/cli",
   "description": "CLI of the Booster Cloud Framework, the next level of abstraction for cloud-native applications",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "author": "Booster Cloud",
   "homepage": "https://booster.cloud",
   "publishConfig": {
@@ -12,8 +12,8 @@
   },
   "bugs": "https://github.com/boostercloud/booster/issues",
   "dependencies": {
-    "@boostercloud/framework-core": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0",
+    "@boostercloud/framework-core": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1",
     "@oclif/command": "^1",
     "@oclif/config": "^1",
     "@oclif/plugin-help": "^2",

packages/framework-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-core",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Library for your Booster apps",
   "author": "Booster Cloud",
   "homepage": "https://booster.cloud",
@@ -28,7 +28,7 @@
     "url": "https://github.com/boostercloud/booster/issues"
   },
   "dependencies": {
-    "@boostercloud/framework-types": "^0.5.0",
+    "@boostercloud/framework-types": "^0.5.1",
     "fp-ts": "^2.0.3",
     "graphql": "^15.0.0",
     "graphql-subscriptions": "^1.1.0",

packages/framework-integration-tests/integration/providers/aws/subscriptions.integration.ts

@@ -17,12 +17,11 @@ describe('subscriptions', () => {
     })
 
     it('should delete a subscription when the client calls "unsubscribe"', async () => {
-      const mockCartId = random.uuid()
       const originalSubscriptionsCount = await countSubscriptionsItems()
 
       // Let's create two subscriptions to the same read model
-      cartSubscription(client, mockCartId).subscribe(() => {})
-      const subscriptionObservable = cartSubscription(client, mockCartId).subscribe(() => {})
+      cartSubscription(client, random.uuid()).subscribe(() => {})
+      const subscriptionObservable = cartSubscription(client, random.uuid()).subscribe(() => {})
 
       // Wait for for the subscriptions to arrive
       await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount + 2)
@@ -37,28 +36,32 @@ describe('subscriptions', () => {
 
   describe('the "terminate" operation', () => {
     it('should delete al subscription of the connectionID when socket is disconnected', async () => {
-      const originalSubscriptionsCount = await countSubscriptionsItems()
-      const mockCartId = random.uuid()
-
-      // Let's create one subscription for one client
       const clientA = await graphQLClientWithSubscriptions()
-      cartSubscription(clientA, mockCartId).subscribe(() => {})
-
-      // Let's create two subscriptions for another client
       const clientB = await graphQLClientWithSubscriptions()
-      cartSubscription(clientB, mockCartId).subscribe(() => {})
-      cartSubscription(clientB, mockCartId).subscribe(() => {})
+      try {
+        const originalSubscriptionsCount = await countSubscriptionsItems()
 
-      // Wait for for the subscriptions to arrive
-      await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount + 3)
+        // Let's create one subscription for one client
+        cartSubscription(clientA, random.uuid()).subscribe(() => {})
 
-      // Now we close the socket of client B and check its 2 subscriptions were deleted
-      clientB.disconnect()
-      await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount + 1)
+        // Let's create two subscriptions for another client
+        cartSubscription(clientB, random.uuid()).subscribe(() => {})
+        cartSubscription(clientB, random.uuid()).subscribe(() => {})
+
+        // Wait for for the subscriptions to arrive
+        await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount + 3)
 
-      // Finally, close the socket of client A and check that we are back to the original count of subscriptions
-      clientA.disconnect()
-      await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount)
+        // Now we close the socket of client B and check its 2 subscriptions were deleted
+        clientB.disconnect()
+        await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount + 1)
+
+        // Finally, close the socket of client A and check that we are back to the original count of subscriptions
+        clientA.disconnect()
+        await waitForIt(countSubscriptionsItems, (newCount) => newCount == originalSubscriptionsCount)
+      } catch (e) {
+        clientA.disconnect()
+        clientB.disconnect()
+      }
     })
   })
 })

packages/framework-integration-tests/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@boostercloud/framework-integration-tests",
   "description": "Example project for Booster",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "author": "Booster Cloud",
   "homepage": "https://booster.cloud",
   "private": true,
@@ -10,13 +10,13 @@
   },
   "bugs": "https://github.com/boostercloud/booster/issues",
   "dependencies": {
-    "@boostercloud/framework-core": "^0.5.0",
-    "@boostercloud/framework-provider-aws": "^0.5.0",
-    "@boostercloud/framework-provider-local": "^0.5.0"
+    "@boostercloud/framework-core": "^0.5.1",
+    "@boostercloud/framework-provider-aws": "^0.5.1",
+    "@boostercloud/framework-provider-local": "^0.5.1"
   },
   "devDependencies": {
-    "@boostercloud/framework-provider-aws-infrastructure": "^0.5.0",
-    "@boostercloud/framework-provider-local-infrastructure": "^0.5.0",
+    "@boostercloud/framework-provider-aws-infrastructure": "^0.5.1",
+    "@boostercloud/framework-provider-local-infrastructure": "^0.5.1",
     "@types/aws-lambda": "^8.10.48",
     "@types/faker": "^4.1.12",
     "@types/ws": "^7.2.4",

packages/framework-provider-aws-infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-aws-infrastructure",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle the Booster deployment process to AWS",
   "keywords": [
     "framework-provider-aws-infrastructure"
@@ -30,8 +30,8 @@
     "@aws-cdk/aws-lambda-event-sources": "1.26.0",
     "@aws-cdk/aws-s3": "1.26.0",
     "@aws-cdk/aws-s3-deployment": "1.26.0",
-    "@boostercloud/framework-provider-aws": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0",
+    "@boostercloud/framework-provider-aws": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1",
     "aws-cdk": "1.26.0",
     "colors": "^1.4.0"
   },

packages/framework-provider-aws/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-aws",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle Booster's integration with AWS",
   "keywords": [
     "framework-provider-aws"
@@ -20,7 +20,7 @@
     "url": "git+https://github.com/boostercloud/booster.git"
   },
   "dependencies": {
-    "@boostercloud/framework-types": "^0.5.0"
+    "@boostercloud/framework-types": "^0.5.1"
   },
   "scripts": {
     "lint": "eslint --ext '.js,.ts' **/*.ts",

packages/framework-provider-azure-infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-azure-infrastructure",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle the Booster deployment process to Azure",
   "keywords": [
     "framework-provider-azure-infrastructure"
@@ -22,8 +22,8 @@
   "dependencies": {
     "@azure/arm-appservice": "^6.0.0",
     "@azure/cosmos": "^3.7.3",
-    "@boostercloud/framework-provider-azure": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0",
+    "@boostercloud/framework-provider-azure": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1",
     "archiver": "^4.0.1",
     "azure-arm-resource": "^7.3.0",
     "azure-arm-website": "^5.7.0",

packages/framework-provider-azure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-azure",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle Booster's integration with Azure",
   "keywords": [
     "framework-provider-azure"
@@ -22,7 +22,7 @@
   "dependencies": {
     "@azure/cosmos": "^3.7.2",
     "@azure/functions": "^1.2.2",
-    "@boostercloud/framework-types": "^0.5.0"
+    "@boostercloud/framework-types": "^0.5.1"
   },
   "scripts": {
     "lint": "eslint --ext '.js,.ts' **/*.ts",

packages/framework-provider-kubernetes-infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-kubernetes-infrastructure",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle Booster's integration with Kubernetes",
   "keywords": [
     "framework-provider-kubernetes-infrastructure"
@@ -20,8 +20,8 @@
     "url": "git+https://github.com/boostercloud/booster.git"
   },
   "dependencies": {
-    "@boostercloud/framework-provider-kubernetes": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0"
+    "@boostercloud/framework-provider-kubernetes": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1"
   },
   "scripts": {
     "lint": "eslint --ext '.js,.ts' **/*.ts",

packages/framework-provider-kubernetes/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-kubernetes",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle Booster's integration with Kubernetes",
   "keywords": [
     "framework-provider-kubernetes"
@@ -20,7 +20,7 @@
     "url": "git+https://github.com/boostercloud/booster.git"
   },
   "dependencies": {
-    "@boostercloud/framework-types": "^0.5.0"
+    "@boostercloud/framework-types": "^0.5.1"
   },
   "scripts": {
     "lint": "eslint --ext '.js,.ts' **/*.ts",

packages/framework-provider-local-infrastructure/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-local-infrastructure",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Handle the Booster running process of the local runtime",
   "keywords": [
     "framework-provider-local-infrastructure"
@@ -20,8 +20,8 @@
     "url": "git+https://github.com/boostercloud/booster.git"
   },
   "dependencies": {
-    "@boostercloud/framework-provider-local": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0",
+    "@boostercloud/framework-provider-local": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1",
     "express": "^4.17.1",
     "nedb": "^1.8.0"
   },

packages/framework-provider-local/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-provider-local",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Debug your Booster projects locally",
   "keywords": [
     "framework-provider-aws"
@@ -20,8 +20,8 @@
     "url": "git+https://github.com/boostercloud/booster.git"
   },
   "dependencies": {
-    "@boostercloud/framework-core": "^0.5.0",
-    "@boostercloud/framework-types": "^0.5.0"
+    "@boostercloud/framework-core": "^0.5.1",
+    "@boostercloud/framework-types": "^0.5.1"
   },
   "scripts": {
     "lint": "eslint --ext '.js,.ts' **/*.ts",

packages/framework-types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boostercloud/framework-types",
-  "version": "0.5.0",
+  "version": "0.5.1",
   "description": "Contains Booster types related to the information extracted from the user project",
   "keywords": [
     "framework-types"