Adding AttachDataDiskLinuxVM scenario and base code

.github/workflows/scenario-testing.yaml

@@ -9,28 +9,36 @@ on:
     branches:
       - main
   workflow_dispatch:
-
+permissions:
+  id-token: write
+  contents: read
 jobs:
   test-ocd-scenarios:
     runs-on: ubuntu-latest
+    # This is needed in order to obtain OIDC tokens to sign this pipeline into
+    # the testing subscription for any branch in this repository.
+    environment: ScenarioTesting
     steps:
       - uses: actions/checkout@v2
       - name: Build all targets.
         run: |
           make build-all
           make test-all
       - name: Sign into Azure
-        uses: azure/actions/login@v1
+        uses: azure/login@v1
         with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
+          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+          subscription-id: ${{ secrets.AZURE_SUBSCRIPTION }}
       - name: Run all one click deployment scenarios.
         uses: azure/CLI@v1
         if: github.event_name != 'pull_request'
         with:
+          azcliversion: 2.53.0
           inlineScript: |
-            apk add --no-cache make
-            make test-scenarios SUBSCRIPTION=${{ secrets.AZURE_SUBSCRIPTION }}
+            apk add --no-cache make git openssh openssl helm curl jq
+            make test-upstream-scenarios SUBSCRIPTION=${{ secrets.AZURE_SUBSCRIPTION }}
       - name: Display ie.log file
-        if: github.event_name != 'pull_request'
+        if: (success() || failure()) && github.event_name != 'pull_request'
         run: |
           cat ie.log

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "upstream-scenarios"]
+	path = upstream-scenarios
+	url = https://github.com/MicrosoftDocs/executable-docs

Makefile

@@ -35,14 +35,30 @@ test-all:
 
 SUBSCRIPTION ?= 00000000-0000-0000-0000-000000000000
 SCENARIO ?= ./README.md
+WORKING_DIRECTORY ?= $(PWD)
 test-scenario:
 	@echo "Running scenario $(SCENARIO)"
-	$(IE_BINARY) test $(SCENARIO) --subscription $(SUBSCRIPTION)
+	$(IE_BINARY) test $(SCENARIO) --subscription $(SUBSCRIPTION) --working-directory $(WORKING_DIRECTORY)
 
 test-scenarios:
 	@echo "Testing out the scenarios"
 	for dir in ./scenarios/ocd/*/; do \
-		 $(MAKE) test-scenario SCENARIO="$${dir}README.md" SUBCRIPTION="$(SUBSCRIPTION)"; \
+		($(MAKE) test-scenario SCENARIO="$${dir}README.md" SUBCRIPTION="$(SUBSCRIPTION)") || exit $$?; \
+	done
+
+test-upstream-scenarios:
+	@echo "Pulling the upstream scenarios"
+	@git config --global --add safe.directory /home/runner/work/InnovationEngine/InnovationEngine
+	@git submodule update --init --recursive
+	@echo "Testing out the upstream scenarios"
+	for dir in ./upstream-scenarios/scenarios/*/; do \
+		if ! [ -f $${dir}README.md ]; then \
+			continue; \
+		fi; \
+		if echo "$${dir}" | grep -q "CreateContainerAppDeploymentFromSource"; then \
+			continue; \
+		fi; \
+		($(MAKE) test-scenario SCENARIO="$${dir}README.md" SUBCRIPTION="$(SUBSCRIPTION)" WORKING_DIRECTORY="$${dir}") || exit $$?; \
 	done
 
 # ------------------------------- Run targets ----------------------------------

cmd/ie/commands/execute.go

@@ -123,7 +123,7 @@ var executeCommand = &cobra.Command{
 		err = innovationEngine.ExecuteScenario(scenario)
 		if err != nil {
 			logging.GlobalLogger.Errorf("Error executing scenario: %s", err)
-			fmt.Printf("Error executing scenario: %s", err)
+			fmt.Printf("Error executing scenario: %s\n", err)
 			os.Exit(1)
 		}
 	},

cmd/ie/commands/test.go

@@ -16,6 +16,8 @@ func init() {
 		Bool("verbose", false, "Enable verbose logging & standard output.")
 	testCommand.PersistentFlags().
 		String("subscription", "", "Sets the subscription ID used by a scenarios azure-cli commands. Will rely on the default subscription if not set.")
+	testCommand.PersistentFlags().
+		String("working-directory", ".", "Sets the working directory for innovation engine to operate out of. Restores the current working directory when finished.")
 }
 
 var testCommand = &cobra.Command{
@@ -32,12 +34,14 @@ var testCommand = &cobra.Command{
 
 		verbose, _ := cmd.Flags().GetBool("verbose")
 		subscription, _ := cmd.Flags().GetString("subscription")
+		workingDirectory, _ := cmd.Flags().GetString("working-directory")
 
 		innovationEngine, err := engine.NewEngine(engine.EngineConfiguration{
-			Verbose:       verbose,
-			DoNotDelete:   false,
-			Subscription:  subscription,
-			CorrelationId: "",
+			Verbose:          verbose,
+			DoNotDelete:      false,
+			Subscription:     subscription,
+			CorrelationId:    "",
+			WorkingDirectory: workingDirectory,
 		})
 
 		if err != nil {
@@ -57,7 +61,11 @@ var testCommand = &cobra.Command{
 			os.Exit(1)
 		}
 
-		innovationEngine.TestScenario(scenario)
-
+		err = innovationEngine.TestScenario(scenario)
+		if err != nil {
+			logging.GlobalLogger.Errorf("Error testing scenario: %s", err)
+			fmt.Printf("Error testing scenario: %s\n", err)
+			os.Exit(1)
+		}
 	},
 }

scenarios/ocd/AttachDataDiskLinuxVM/DataDisk_VM.md

@@ -0,0 +1,89 @@
+az login
+az account set --subscription "XXXXXXX"
+az account show
+
+#VARIABLE DECLARATION
+export NETWORK_PREFIX="$(($RANDOM % 254 + 1))"
+export RANDOM_ID="$(openssl rand -hex 3)"
+export MY_RESOURCE_GROUP_NAME="myResourceGroup$RANDOM_ID"
+export REGION="eastus"
+export MY_VM_NAME="myVMName$RANDOM_ID"
+export MY_VM_IMAGE='Ubuntu2204'
+export MY_VM_USERNAME="azureuser"
+export MY_VM_SIZE='Standard_DS2_v5'
+export MY_VNET_NAME="myVNet$RANDOM_ID"
+export MY_VNET_PREFIX="10.$NETWORK_PREFIX.0.0/16"
+export MY_VM_NIC_NAME="myVMNicName$RANDOM_ID"
+export MY_SN_NAME="mySN$RANDOM_ID"
+export MY_SN_PREFIX="10.$NETWORK_PREFIX.0.0/24"
+export MY_PUBLIC_IP_NAME="myPublicIP$RANDOM_ID"
+export MY_DNS_LABEL="mydnslabel$RANDOM_ID"
+export MY_NSG_NAME="myNSGName$RANDOM_ID"
+
+#CREATE A RESOURCE GROUP
+az group create \
+    --name $MY_RESOURCE_GROUP_NAME \
+    --location $REGION -o JSON
+
+#SET UP VM NETWORK
+az network vnet create \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --name $MY_VNET_NAME \
+    --location $REGION \
+    --address-prefix $MY_VNET_PREFIX \
+    --subnet-name $MY_SN_NAME \
+    --subnet-prefix $MY_SN_PREFIX -o JSON
+
+#CREATE STATIC PUBLIC IP 
+az network public-ip create \
+    --name $MY_PUBLIC_IP_NAME \
+    --location $REGION \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --dns-name $MY_DNS_LABEL \
+    --sku Standard \
+    --allocation-method static \
+    --version IPv4 \
+    --zone 1 2 3 -o JSON
+
+#CREATE NSG
+az network nsg create \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --name $MY_NSG_NAME \
+    --location $REGION -o JSON
+
+#CREATE NSG RULES
+az network nsg rule create \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --nsg-name $MY_NSG_NAME \
+    --name $MY_NSG_SSH_RULE \
+    --access Allow \
+    --protocol Tcp \
+    --direction Inbound \
+    --priority 100 \
+    --source-address-prefix '*' \
+    --source-port-range '*' \
+    --destination-address-prefix '*' \
+    --destination-port-range 22 80 443 -o JSON
+
+#CREATE NIC
+az network nic create \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --name $MY_VM_NIC_NAME \
+    --location $REGION \
+    --ip-forwarding false \
+    --subnet $MY_SN_NAME \
+    --vnet-name $MY_VNET_NAME \
+    --network-security-group $MY_NSG_NAME \
+    --public-ip-address $MY_PUBLIC_IP_NAME -o JSON
+
+#CREATE LINUX VM
+az vm create \
+    --resource-group $MY_RESOURCE_GROUP_NAME \
+    --name $MY_VM_NAME \
+    --image $MY_VM_IMAGE \
+    --admin-username $MY_VM_USERNAME \
+    --generate-ssh-keys \
+    --assign-identity $MY_VM_ID \
+    --size $MY_VM_SIZE \
+    --custom-data cloud-init-nginx.txt \
+    --nics $MY_VM_NIC_NAME