[EventGrid] Make `build:samples" work (Azure#13057)

ellismg · web-flow · commit 86f9d2edb7d6 · 2021-01-05T15:15:40.000-08:00
- Update to the GA version of the Service Bus package in our samples and deal with the breaking changes. - Add `@azure/service-bus` as a dev-dependency since the samples use it and we need it around when we do `build:samples` - Have `build:samples` use `dev-tool` to prepare the samples and then build them, like our other packages do Fixes Azure#12730
diff --git a/sdk/eventgrid/eventgrid/package.json b/sdk/eventgrid/eventgrid/package.json
@@ -51,7 +51,7 @@
     "build:autorest": "autorest ./swagger/README.md --typescript --v3",
     "build:browser": "tsc -p . && cross-env ONLY_BROWSER=true rollup -c 2>&1",
     "build:node": "tsc -p . && cross-env ONLY_NODE=true rollup -c 2>&1",
-    "build:samples": "echo Skipped.",
+    "build:samples": "dev-tool samples prep && cd dist-samples && tsc -p .",
     "build:test": "tsc -p . && rollup -c rollup.test.config.js 2>&1",
     "build": "tsc -p . && rollup -c 2>&1 && api-extractor run --local",
     "check-format": "prettier --list-different --config ../../../.prettierrc.json --ignore-path ../../../.prettierignore \"src/**/*.ts\" \"test/**/*.ts\" \"*.{js,json}\"",
@@ -87,7 +87,9 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
+    "@azure/dev-tool": "^1.0.0",
     "@azure/eslint-plugin-azure-sdk": "^3.0.0",
+    "@azure/service-bus": "^7.0.0",
     "@azure/test-utils-recorder": "^1.0.0",
     "@microsoft/api-extractor": "7.7.11",
     "@rollup/plugin-commonjs": "11.0.2",
diff --git a/sdk/eventgrid/eventgrid/samples/javascript/package.json b/sdk/eventgrid/eventgrid/samples/javascript/package.json
@@ -25,7 +25,7 @@
   "sideEffects": false,
   "dependencies": {
     "@azure/eventgrid": "next",
-    "@azure/service-bus": "7.0.0-preview.5",
+    "@azure/service-bus": "^7.0.0",
     "dotenv": "^8.2.0"
   },
   "devDependencies": {
diff --git a/sdk/eventgrid/eventgrid/samples/javascript/src/consumeEventsFromServiceBusQueue.js b/sdk/eventgrid/eventgrid/samples/javascript/src/consumeEventsFromServiceBusQueue.js
@@ -10,41 +10,43 @@ dotenv.config();
 
 // The connection string for Service Bus namespace that Event Grid will deliver messages to.
 // You can find the connection string in the Azure portal.
-// Navigate to Settings > Shared access policies > RootManageSharedAccessKey in your Service Bus Namespace's menu blade to see 
+// Navigate to Settings > Shared access policies > RootManageSharedAccessKey in your Service Bus Namespace's menu blade to see
 // the connection string.
 const serviceBusClientConnectionString = process.env["SERVICE_BUS_CONNECTION_STRING"] || "";
 
 // The name of the queue within the Service Bus namespace that Event Grid will deliver messages to.
 const serviceBusQueueName = process.env["SERVICE_BUS_QUEUE_NAME"] || "";
 
 // Create a receiver to read messages from the Service Bus Queue.
-const receiver = new ServiceBusClient(serviceBusClientConnectionString).createReceiver(serviceBusQueueName);
+const receiver = new ServiceBusClient(serviceBusClientConnectionString).createReceiver(
+  serviceBusQueueName
+);
 
 // Create a Event Grid Consumer which will decode the payload of service bus message into an array of EventGridEvent objects.
 const consumer = new EventGridConsumer();
 
 // The handler function which will be run on each message we remove from the Service Bus Queue.
-async function processMessage(message) {    
-    // Convert the message into an array of Event Grid Events.
-    const events = await consumer.deserializeEventGridEvents(message.body);
-
-    // Process each message, printing the type and ID. In addition, if the event is a system event generated by Azure when
-    // a blob is created, print the URL from the event.
-    for (const event of events) {
-        console.log(`Processing event of type ${event.eventType} with id: ${event.id}`);        
-        if (isSystemEvent("Microsoft.Storage.BlobCreated", event)) {
-            console.log(`A blob was created with URL: ${event.data.url}`);
-        }
+async function processMessage(message) {
+  // Convert the message into an array of Event Grid Events.
+  const events = await consumer.deserializeEventGridEvents(message.body);
+
+  // Process each message, printing the type and ID. In addition, if the event is a system event generated by Azure when
+  // a blob is created, print the URL from the event.
+  for (const event of events) {
+    console.log(`Processing event of type ${event.eventType} with id: ${event.id}`);
+    if (isSystemEvent("Microsoft.Storage.BlobCreated", event)) {
+      console.log(`A blob was created with URL: ${event.data.url}`);
     }
+  }
 
-    // Complete the message so that it is removed from the queue and not processed again.
-    await message.complete();
+  // Complete the message so that it is removed from the queue and not processed again.
+  await receiver.completeMessage(message);
 }
 
 // Start processing events.
 receiver.subscribe({
-    processMessage,
-    processError: async (err) => {
-        console.error("The sample encountered an error:", err);      
-    }
+  processMessage,
+  processError: async (err) => {
+    console.error("The sample encountered an error:", err);
+  }
 });
diff --git a/sdk/eventgrid/eventgrid/samples/tsconfig.json b/sdk/eventgrid/eventgrid/samples/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "outDir": "typescript/dist",
+    "lib": ["dom", "dom.iterable", "esnext.asynciterable"]
+  },
+  "include": ["typescript/src/**.ts"],
+  "exclude": ["typescript/*.json", "**/node_modules/", "../node_modules", "../typings"]
+}
diff --git a/sdk/eventgrid/eventgrid/samples/typescript/package.json b/sdk/eventgrid/eventgrid/samples/typescript/package.json
@@ -30,7 +30,7 @@
   "sideEffects": false,
   "dependencies": {
     "@azure/eventgrid": "next",
-    "@azure/service-bus": "7.0.0-preview.5",
+    "@azure/service-bus": "^7.0.0",
     "dotenv": "^8.2.0"
   },
   "devDependencies": {
diff --git a/sdk/eventgrid/eventgrid/samples/typescript/src/consumeEventsFromServiceBusQueue.ts b/sdk/eventgrid/eventgrid/samples/typescript/src/consumeEventsFromServiceBusQueue.ts
@@ -2,49 +2,51 @@
 // Licensed under the MIT license.
 
 import { EventGridConsumer, isSystemEvent } from "@azure/eventgrid";
-import { ServiceBusClient, ReceivedMessageWithLock } from "@azure/service-bus";
+import { ServiceBusClient, ServiceBusReceivedMessage } from "@azure/service-bus";
 import * as dotenv from "dotenv";
 
 // Load the .env file if it exists
 dotenv.config();
 
 // The connection string for Service Bus namespace that Event Grid will deliver messages to.
 // You can find the connection string in the Azure portal.
-// Navigate to Settings > Shared access policies > RootManageSharedAccessKey in your Service Bus Namespace's menu blade to see 
+// Navigate to Settings > Shared access policies > RootManageSharedAccessKey in your Service Bus Namespace's menu blade to see
 // the connection string.
 const serviceBusClientConnectionString = process.env["SERVICE_BUS_CONNECTION_STRING"] || "";
 
 // The name of the queue within the Service Bus namespace that Event Grid will deliver messages to.
 const serviceBusQueueName = process.env["SERVICE_BUS_QUEUE_NAME"] || "";
 
 // Create a receiver to read messages from the Service Bus Queue.
-const receiver = new ServiceBusClient(serviceBusClientConnectionString).createReceiver(serviceBusQueueName);
+const receiver = new ServiceBusClient(serviceBusClientConnectionString).createReceiver(
+  serviceBusQueueName
+);
 
 // Create a Event Grid Consumer which will decode the payload of service bus message into an array of EventGridEvent objects.
 const consumer = new EventGridConsumer();
 
 // The handler function which will be run on each message we remove from the Service Bus Queue.
-async function processMessage(message: ReceivedMessageWithLock): Promise<void> {    
-    // Convert the message into an array of Event Grid Events.
-    const events = await consumer.deserializeEventGridEvents(message.body);
-
-    // Process each message, printing the type and ID. In addition, if the event is a system event generated by Azure when
-    // a blob is created, print the URL from the event.
-    for (const event of events) {
-        console.log(`Processing event of type ${event.eventType} with id: ${event.id}`);        
-        if (isSystemEvent("Microsoft.Storage.BlobCreated", event)) {
-            console.log(`A blob was created with URL: ${event.data.url}`);
-        }
+async function processMessage(message: ServiceBusReceivedMessage): Promise<void> {
+  // Convert the message into an array of Event Grid Events.
+  const events = await consumer.deserializeEventGridEvents(message.body);
+
+  // Process each message, printing the type and ID. In addition, if the event is a system event generated by Azure when
+  // a blob is created, print the URL from the event.
+  for (const event of events) {
+    console.log(`Processing event of type ${event.eventType} with id: ${event.id}`);
+    if (isSystemEvent("Microsoft.Storage.BlobCreated", event)) {
+      console.log(`A blob was created with URL: ${event.data.url}`);
     }
+  }
 
-    // Complete the message so that it is removed from the queue and not processed again.
-    await message.complete();
+  // Complete the message so that it is removed from the queue and not processed again.
+  await receiver.completeMessage(message);
 }
 
 // Start processing events.
 receiver.subscribe({
-    processMessage,
-    processError: async (err) => {
-        console.error("The sample encountered an error:", err);      
-    }
+  processMessage,
+  processError: async (err) => {
+    console.error("The sample encountered an error:", err);
+  }
 });
