updated readme & license, topic subscription

Author: marcduiker

LICENSE.md

@@ -1 +1,3 @@
-The content of this workshop, created by Marc Duiker / Xpirit, is licensed under a [Attribution-NonCommercial-ShareAlike 4.0 International License (CC BY-NC-SA 4.0) ](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+The content of this workshop, created by Marc Duiker / Xpirit, is licensed under a [Attribution-NonCommercial-ShareAlike 4.0 International License (CC BY-NC-SA 4.0) ](https://creativecommons.org/licenses/by-nc-sa/4.0/)
+
+Contact me at [[email protected]](mailto:[email protected]) if you want to use this material for a training at your organisation.

README.md

@@ -35,6 +35,18 @@ The NEO data (of type `DetectedNEOEvent`) looks as follows:
 
 Another team was tasked with the ingestion of the NEO data and this data is already being pushed to an Azure Servicebus topic.
 
+You are tasked with creating two Azure Function apps which are decscribed below.
+
+### XASA Onboarding Function App
+
+You will be responsible for automating a part of the onboarding process for new XASA employees. This Function App will contain two functions:
+
+- An HTTP trigger function which validates the input (username & email) and puts a message on a queue.
+- A Queue trigger function which calls an service to register the user and returns connectionstring and api key information. The result is stored in blob storage.
+
+```
+POST --> HTTP trigger --> Queue trigger --> Blob
+```
 ### NEO Event Processor Function App
 
 You will be responsible for creating a Function App that is triggered by messages pushed to the Servicebus topic.
@@ -49,6 +61,27 @@ The Function App needs to make several calls to other services in order to deter
 
 In addition to these service calls, the processed data needs to be stored to blob storage (for events with a Torino impact >= 1) and a notification needs to be sent out to Bruce Willis (for events with a Torino impact >= 8).
 
+
+```
+Message --> Servicebus trigger --> NeoEventProcessingOrchestrator
+                                                   |
+                                                   V
+                                       EstimateKineticEnergyActivity
+                                                   |
+                                                   V
+                                      EstimateImpactProbabilityActivity
+                                                   |
+                                                   V
+                                       EstimateTorinoImpactActivity
+                                                   |
+                                                   V
+                                      StoreProcessedNeoEventActivity
+                                                   |
+                                                   V
+                                        SendNotificationActivity
+
+```
+
 > The final implementation is also in this repo. However, it is lots more fun, and you learn way more, by creating your own solution and following all the labs. Only peek at my solution if you're completely stuck.
 
 >**I strongly suggest you team up with someone to do pair programming and discuss what you're doing.**
@@ -57,17 +90,20 @@ In addition to these service calls, the processed data needs to be stored to blo
 
 ## Labs
 
-0. [Check Prerequisites](labs/0_prerequisites.md) & [Get your subscription keys](labs/0_subscribe.md)
-1. [Creating a new function project](labs/1_creating_a_function_project.md)
-2. [Creating an orchestration client](labs/2_create_orchestration_client.md)
-3. [Creating the orchestrator function](labs/3_create_orchestrator_function.md)
-4. [Calling other services](labs/4_create_activity_functions_services.md)
-5. [Storing the ProcessedNeoEvent](labs/5_create_activity_function_storage.md)
-6. [Sending a notification](labs/6_send_notification.md)
-7. [Unit testing](labs/7_unit_testing.md)
-8. [Creating Azure resources](labs/8_create_azure_resources.md)
-9. [Publish to Azure](labs/9_publish_to_azure.md)
-10. [Additional features](labs/10_additional_features.md)
+0. [Check Prerequisites](labs/0_prerequisites.md)
+1. [Creating a new function project with an http trigger](labs/1_creating_a_function_project.md)
+2. [Adding a queue output binding](labs/2_adding_a_queue_binding.md)
+3. [Adding a queue trigger function](labs/3_create_queuetrigger_function.md)
+4. [Creating a new function project with a servicebus trigger](labs/4_adding_servicebus_trigger.md)
+5. [Creating an orchestration client](labs/5_create_orchestration_client.md)
+6. [Creating the orchestrator function](labs/6_create_orchestrator_function.md)
+7. [Calling other services](labs/7_create_activity_functions_services.md)
+8. [Storing the ProcessedNeoEvent](labs/8_create_activity_function_storage.md)
+9. [Sending a notification](labs/9_send_notification.md)
+10. [Unit testing](labs/10_unit_testing.md)
+11. [Creating Azure resources](labs/11_create_azure_resources.md)
+12. [Publish to Azure](labs/12_publish_to_azure.md)
+13. [Additional features](labs/13_additional_features.md)
 
 ## License
 

http/onboaring.http http/onboarding.http

@@ -15,7 +15,7 @@ With your IDE of choice create a Function App (suggested name: `NeoEventProcessi
 
     -   Connectionstring setting name: `NEOEventsTopic`
     -   Topic name: `neo-events`
-    -   Subscription name: `<subscriptionname>` (will be different for each attendee)
+    -   Subscription name: `<subscriptionname>` (get this from the blob json file that is created in the earlier previous lab)
 
 The resulting servicebus function trigger should look something like this:
 
@@ -25,7 +25,7 @@ The resulting servicebus function trigger should look something like this:
 
 The trigger now has a connection name which will be looked up in the application settings. But there's is no actual connectionstring specified yet. 
 
-Add the connection name and the connectionstring to the `local.settings.json` file in your local function folder:
+Add the connection name and the actual connectionstring (from the json file) to the `local.settings.json` file in your local function folder:
 
 ```json
 {

labs/4_adding_servicebus_trigger.md

@@ -11,7 +11,7 @@ public class NeoEventProcessingClientServicebus
     {
         [FunctionName(nameof(NeoEventProcessingClientServicebus))]
         public async Task Run(
-            [ServiceBusTrigger("neo-events", "marc-duiker-db75252d-47f5-4b02-9911-c1378e44612d", Connection = "NEOEventsTopic")]string message, 
+            [ServiceBusTrigger("neo-events", "marc-duiker-30ae5962-40e1-4c9f-b5fd-9cc834edd2f4", Connection = "NEOEventsTopic")]string message, 
             [DurableClient]IDurableClient orchestrationClient,
             ILogger log)
         {