Merge branch 'Azure' into feature/enable-accumulative-editing

Author: saragluna

apps/acme-assist/src/main/resources/application.yaml

@@ -19,4 +19,4 @@ management:
   endpoints:
     web:
       exposure:
-        include: info,health
+        include: info,health

azure-spring-apps-enterprise/README.md

@@ -1903,7 +1903,7 @@ cd apps/acme-assist
         --build-env BP_JVM_VERSION=17 \
         --env \
             SPRING_AI_AZURE_OPENAI_ENDPOINT=${SPRING_AI_AZURE_OPENAI_ENDPOINT} \
-            SPRING_AI_AZURE_OPENAI_API_KEY=${SPRING_AI_AZURE_OPENAI_API_KEY}
+            SPRING_AI_AZURE_OPENAI_API_KEY=${SPRING_AI_AZURE_OPENAI_APIKEY}
     ```
 
 1. Test the `acme-fitness` application in the browser again. Go to `ASK TO FITASSIST` and converse with the assistant, e.g.

azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/README.md

@@ -10,3 +10,4 @@ There are 3 workshops that are available here:
 
  - [ai](./ai/README.md) : Deploys an AI assist service component to an existing mock e-commerce polyglot application called acme-fitness. Goal of this workshop is to introduce users to Spring AI and how to work with Azure OpenAI resources.
 
+ - [day](./day/README.md) : Full day Azure for Spring Developers workshop. It introduces Azure Portal, Azure CLI and Azure Spring Apps Enterprise to Spring developers. They start deploying a simple Spring Hello World application. Then they look at Acme Fitness Store polyglot mock e-commerce application. Finally, they explore Azure OpenAI service and deploy AI chat component for the Acme Fitness Store polyglot application and connect it to Azure OpenAI service.

azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/00-workshop-kickoff/README.md

@@ -0,0 +1,26 @@
+# 00 - Workshop Kickoff
+
+Please check with the workshop moderator if this step has already been configured and completed for you.
+
+## Create Azure Account for the workshop
+
+To start the workshop, you need to have an Azure account with active subscription. If this is not provided by your company, please sign-up for a free Azure account which gives you $100 worth of free credit per month. Free account can be created by visiting [Microsoft Azure Pass](https://www.microsoftazurepass.com/)
+
+As part of the workshop you will be provided a __Promo Code__ which gives $100 worth of free credits. Please make sure you enter the __Promo Code__ when you sign up for the new Azure account.
+
+Once the account is created, please forward your `subscription id` to the workshop moderator. They will ensure the background processing is completed for you to go ahead and start using the subscription.
+
+Subscription id can be accessed as below
+ - Login to [Azure Portal](https://portal.azure.com)
+ - In the search bar, type the keyword `Subscriptions`. This should pull up your subscription.
+   ![Subscriptions in Azure Portal](./images/azure-portal-subscriptions.png)
+ - Click on the subscription link that shows up in the search results
+ - On the result page you will find the `Subscription ID`, e.g. `00001111-aaaa-bbbb-cccc-ddddeeeeffff`
+
+ ## Alternatively - Connect to an existing Azure Subscription
+
+Check with the workshop moderator, an environment might have already been created for you. Please provide your Microsoft / Azure account so they can associate your account with an existing subscription.
+
+## Next Guide
+
+Next guide [01 - Azure Introduction](../01-azure-introduction/README.md)

azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/00-workshop-kickoff/images/azure-portal-subscriptions.png

@@ -0,0 +1,177 @@
+# 01 - Azure Introduction
+
+In this section we will configure your Azure Subscription and Azure CLI.
+
+## Login to Azure Portal
+
+* Please go to [Azure Portal](https://portal.azure.com) and use your Microsoft / Azure account to login. You might need to authenticate with your phone number.
+
+### Alternative 1: Using Azure Cloud Shell
+
+* Select `Azure Cloud Shell` from the top navigation bar, e.g.
+
+![Select Cloud Shell from Azure Portal navigation bar](./images/cloud-shell-01.png)
+
+* If this is the first time you run Azure Cloud Shell, you will need to select `Bash`, e.g.
+
+![Select Bash](./images/cloud-shell-02.png)
+
+* Select to `Mount storage account`. Select storage account subscription from existing subscriptions, e.g.
+
+![Select to mount storage account and use existing subscription](./images/cloud-shell-03.png)
+
+* Select `We will create a storage account for you` if you don't want to play with unique storage account names and naming rules, e.g.
+
+![Create a storage account for you](./images/cloud-shell-04.png)
+
+* Finally, wait for the Azure Cloud Shell to connect. Type in `az version` to find out the version of the Azure CLI, e.g.
+
+```shell
+az version
+```
+
+![Azure Cloud Shell az version](./images/cloud-shell-05.png)
+
+### Alternative 2: Using your desktop shell
+
+* Please install [Azure CLI](https://docs.microsoft.com/cli/azure/install-azure-cli?view=azure-cli-latest) to your desktop. 
+
+* Use `az version` to check the version of Azure CLI installed, e.g.
+
+```shell
+az version
+
+{
+  "azure-cli": "2.60.0",
+  "azure-cli-core": "2.60.0",
+  "azure-cli-telemetry": "1.1.0",
+  "extensions": {
+    "ai-examples": "0.2.5",
+    "ml": "2.25.1",
+    "ssh": "2.0.3"
+  }
+}
+```
+
+* Login using Azure CLI, e.g.
+
+```shell
+az login
+```
+
+* Follow the login instructions.
+
+* Alternatively, you could use device code, e.g.
+
+```shell
+az login --use-device-code
+
+To sign in, use a web browser to open the page https://microsoft.com/devicelogin and enter the code EJHGVJQHA to authenticate.
+```
+
+* Follow the directions in the browser, and paste the code from the shell above, e.g.
+
+![Azure CLI login using device code](./images/azure-cli-login-01.png)
+
+* Feel free to close the browser window, once you login, e.g.
+
+![Azure CLI login using device code](./images/azure-cli-login-02.png)
+
+
+
+## Azure CLI
+
+Please refer to [Azure CLI documentation](https://learn.microsoft.com/en-us/cli/azure/cheat-sheet-onboarding) for more details.
+
+### List all your subscriptions
+
+* You can use Azure CLI to list all of your subscritions and account details, e.g.
+
+```shell
+az account list -o table
+```
+
+### Optional: Setting up default subscription
+
+* You can set the default subscription in case you have multiple subscriptions, e.g.
+```shell
+az account set --subscription 00001111-aaaa-bbbb-cccc-ddddeeeeffff
+```
+
+## Add Spring extension
+
+* From your shell environment install Azure Spring extension, e.g.
+
+```shell
+az extension add --upgrade --name spring
+```
+
+* Check installed extensions, e.g.
+
+```
+az extension list -o table
+
+Experimental    ExtensionType    Name         Path                                                               Preview    Version
+--------------  ---------------  -----------  -----------------------------------------------------------------  ---------  ---------
+False           whl              ai-examples  /usr/lib/python3.9/site-packages/azure-cli-extensions/ai-examples  True       0.2.5
+False           whl              ml           /usr/lib/python3.9/site-packages/azure-cli-extensions/ml           False      2.25.1
+False           whl              spring       /home/neven/.azure/cliextensions/spring                            False      1.24.1
+False           whl              ssh          /usr/lib/python3.9/site-packages/azure-cli-extensions/ssh          False      2.0.3
+```
+
+* Test the `spring` command, e.g.
+
+```shell
+az spring --help
+```
+
+## Create a Resource Group using Portal
+
+* Click on `Resource groups` under your `Settings` in subscription, e.g.
+
+![Resource groups](./images/azure-portal-resource-group-01.png)
+
+* Click on `Create` to create a new resource group, e.g.
+
+![Create new Resource Group](./images/azure-portal-resource-group-02.png)
+
+* Select a subscription. Type in a Resource group name, which should be unique within subscription context. Select the Region as instructed by the workshop moderator.
+
+![Create new Resource Group - select resource group name](./images/azure-portal-resource-group-03.png)
+
+* Validate the configuration, e.g.
+
+![Azure Portal Resource Group](./images/azure-portal-resource-group-04.png)
+
+* Look at the `Resource groups` and search for a new resource group being created, e.g.
+
+![New Resource group](./images/azure-portal-resource-group-05.png)
+
+* Let's delete a resource group, e.g.
+
+![New Resource group](./images/azure-portal-resource-group-06.png)
+
+* Confirm the name of the resource group to be deleted, e.g.
+
+![Confirm the deletion of a resource group](./images/azure-portal-resource-group-07.png)
+
+
+## Create a Resource Group using Azure CLI
+
+* List all existing resource groups in the subscription, e.g.
+
+```shell
+az group list -o table
+```
+
+* Create a new resource group using Azure CLI, e.g.
+
+```shell
+az group create --name my-resource-group --location westeurope
+```
+
+* Congratulations! You have successfully created a Resource Group using both Azure Portal and Azure CLI.
+
+## Next Guide
+
+Next guide - [02 - Azure Spring Apps Enterprise Introduction](../02-azure-spring-apps-enterprise-introduction/README.md)

azure-spring-apps-enterprise/workshops/azure-spring-apps-enterprise/day/01-azure-introduction/README.md

@@ -0,0 +1,163 @@
+# 02 - Azure Spring Apps Enterprise Introduction
+
+In this lab we will explore Azure Spring Apps Enterprise (ASA-E) and create an instance we will use throughout the day.
+
+## Accept Azure Spring Apps plan
+
+* You need to accept the Azure Spring Apps Enterprise plan, e.g.
+
+```shell
+az term accept --publisher vmware-inc --product azure-spring-cloud-vmware-tanzu-2 --plan asa-ent-hr-mtr
+```
+
+* Hopefully, there are no problems with your subscription signing the terms. You should see output like this, e.g.
+
+```text
+Command group 'term' is experimental and under development. Reference and support levels: https://aka.ms/CLI_refstatus
+{
+  "accepted": true,
+  "id": "/subscriptions/00001111-aaaa-bbbb-cccc-ddddeeeeffff/providers/Microsoft.MarketplaceOrdering/offerTypes/Microsoft.MarketplaceOrdering/offertypes/publishers/vmware-inc/offers/azure-spring-cloud-vmware-tanzu-2/plans/asa-ent-hr-mtr/agreements/current",
+  "licenseTextLink": "https://mpcprodsa.blob.core.windows.net/legalterms/3E5ED_legalterms_VMWARE%253a2DINC%253a24AZURE%253a2DSPRING%253a2DCLOUD%253a2DVMWARE%253a2DTANZU%253a2D2%253a24ASA%253a2DENT%253a2DHR%253a2DMTR%253a24TO3RAC3XZSHSDTP65CFZW6IPPAHH7AK67FSWSYMURETXWPUSCAVD4OLQYHA6YD5CWK4S4UAJE7VXIOTVYYJ7EJA67IXPJPVHUB2B7DY.txt",
+  "marketplaceTermsLink": "https://mpcprodsa.blob.core.windows.net/marketplaceterms/3EDEF_marketplaceterms_SAAS%253a245XNIYDD23KXQBTPZZUVTDJNYHJZ5Y76OXRLYJ2DHP67BFUMFY42RHUG62CKSGJIAUTE2UN6MIODUJ4JBTOMEQBMWQM4VD2QGXBRTTUY.txt",
+  "name": "asa-ent-hr-mtr",
+  "plan": "asa-ent-hr-mtr",
+  "privacyPolicyLink": "https://www.vmware.com/help/privacy.html",
+  "product": "azure-spring-cloud-vmware-tanzu-2",
+  "publisher": "vmware-inc",
+  "retrieveDatetime": "2024-05-17T19:33:42.611828Z",
+  "signature": "OT7T65UQENLCKBAT5465AVRDAO3IOB46AINSWT5PTBU3Z9RZ3ZBLKCFNWTRE7TLN22MOIFYR7DXOQ466D6DR4OC3NXZ56GQ4HZ4HPDY",
+  "systemData": {
+    "createdAt": "2024-05-17T19:33:46.875169+00:00",
+    "createdBy": "00001111-aaaa-bbbb-cccc-ddddeeeeffff",
+    "createdByType": "ManagedIdentity",
+    "lastModifiedAt": "2024-05-17T19:33:46.875169+00:00",
+    "lastModifiedBy": "00001111-aaaa-bbbb-cccc-ddddeeeeffff",
+    "lastModifiedByType": "ManagedIdentity"
+  },
+  "type": "Microsoft.MarketplaceOrdering/offertypes"
+}
+```
+
+## Create ASA-E Instance
+
+* Let's configure environment variables for this workshop, please use corresponding workshop id, e.g. `asae-student01`
+
+```shell
+export REGION=westeurope
+export SUBSCRIPTION=asae-student01
+export RESOURCE_GROUP=asae-student01
+export SPRING_APPS_SERVICE=asae-student01
+```
+
+* Let's create a resource group for this workshop first, e.g.
+
+```shell
+az group create \
+  --name ${RESOURCE_GROUP} \
+  --location ${REGION}
+```
+
+* Let's create an instance of Azure Spring Apps Enterprise, e.g.
+
+```shell
+az spring create \
+  --name "${SPRING_APPS_SERVICE}" \
+  --resource-group "${RESOURCE_GROUP}" \
+  --location "${REGION}" \
+  --sku enterprise \
+  --enable-application-configuration-service \
+  --application-configuration-service-generation Gen2 \
+  --enable-gateway \
+  --enable-service-registry \
+  --enable-application-live-view \
+  --enable-application-accelerator \
+  --enable-api-portal \
+  --build-pool-size S2 \
+  --verbose
+```
+
+* The above `az spring create` command will take 10+ minutes to complete, as we are configuring lot of components for this Azure Spring Apps Enterprise instance. You can observe the output in the shell, e.g.
+
+```text
+ - Creating Service ..
+Start configure Application Insights
+Application Insights "asae-student01" was created for this Azure Spring Apps. You can visit https://portal.azure.com/#resource/subscriptions/00001111-aaaa-bbbb-cccc-ddddeeeeffff/resourceGroups/asae-student01/providers/microsoft.insights/components/asae-student01/overview to view your Application Insights component
+ - Creating Application Configuration Service ..
+Create with generation Gen2
+- Creating Application Live View ..
+- View Application Live View through Dev Tool portal. Create Dev Tool Portal by running "az spring dev-tool create --service asae-student01 --resource-group asae-student01 --assign-endpoint"
+- Creating Dev Tool Portal ..
+ - Creating Service Registry ..
+ - Creating Spring Cloud Gateway ..
+ - Creating API portal ..
+ - Creating Application Accelerator ..
+ {
+  "id": "/subscriptions/00001111-aaaa-bbbb-cccc-ddddeeeeffff/resourceGroups/asae-student01/providers/Microsoft.AppPlatform/Spring/asae-student01",
+  "location": "westeurope",
+  "name": "asae-student01",
+  "properties": {
+    "fqdn": "asae-student01.azuremicroservices.io",
+    "infraResourceGroup": null,
+    "maintenanceScheduleConfiguration": null,
+    "managedEnvironmentId": null,
+    "marketplaceResource": {
+      "plan": "asa-ent-hr-mtr",
+      "product": "azure-spring-cloud-vmware-tanzu-2",
+      "publisher": "vmware-inc"
+    },
+    "networkProfile": {
+      "appNetworkResourceGroup": null,
+      "appSubnetId": null,
+      "ingressConfig": null,
+      "outboundIPs": {
+        "publicIPs": [
+          "98.64.250.101",
+          "98.64.250.102"
+        ]
+      },
+      "outboundType": "loadBalancer",
+      "requiredTraffics": null,
+      "serviceCidr": null,
+      "serviceRuntimeNetworkResourceGroup": null,
+      "serviceRuntimeSubnetId": null
+    },
+    "powerState": "Running",
+    "provisioningState": "Succeeded",
+    "serviceId": "9b691e1378be429d8dd63ef79c441f08",
+    "version": 3,
+    "vnetAddons": null,
+    "zoneRedundant": false
+  },
+  "resourceGroup": "asae-student01",
+  "sku": {
+    "capacity": null,
+    "name": "E0",
+    "tier": "Enterprise"
+  },
+  "systemData": {
+    "createdAt": "2024-05-17T20:20:29.258713+00:00",
+    "createdBy": "[email protected]",
+    "createdByType": "User",
+    "lastModifiedAt": "2024-05-17T20:20:29.258713+00:00",
+    "lastModifiedBy": "[email protected]",
+    "lastModifiedByType": "User"
+  },
+  "tags": null,
+  "type": "Microsoft.AppPlatform/Spring"
+}
+Command ran in 631.394 seconds (init: 0.167, invoke: 631.227)
+```
+
+* Please explore in [Azure portal](https://portal.azure.com) the creation of the new Azure Spring Apps Enterprise instance, e.g.
+
+![Creating ASAE instance as seen in Azure Portal](./images/azure-spring-apps-enterprise-instance-01.png)
+
+* Once completed, you will see the status changed to `Succeeded`, e.g.
+
+![Completed ASAE instance creation as seen in Azure portal](./images/azure-spring-apps-enterprise-instance-02.png)
+
+* Feel free to explore the [Azure portal](https://portal.azure.com) for the ASA-E instance you have just created.
+
+## Next Guide
+
+Next guide - [03 - Workshop Environment Setup](../03-setup-workshop-environment/README.md)