udacity · wsiwecki · Jun 5, 2023 · Jun 5, 2023 · Jun 5, 2023 · Jun 12, 2023
diff --git a/automatedtesting/jmeter/Starter.jmx → ...edtesting/jmeter/PerformanceTestSuite.jmx b/automatedtesting/jmeter/Starter.jmx → ...edtesting/jmeter/PerformanceTestSuite.jmx
diff --git a/automatedtesting/postman/StarterAPIs.json → ...atedtesting/postman/Test.environment.json b/automatedtesting/postman/StarterAPIs.json → ...atedtesting/postman/Test.environment.json
diff --git a/automatedtesting/postman/TestSuite.Data-Validation.json b/automatedtesting/postman/TestSuite.Data-Validation.json
@@ -0,0 +1,37 @@
+[
+    {
+      "postId": 1,
+      "id": 1,
+      "name": "Labore Laborum",
+      "salary": "1000",
+      "age": "34"
+    },
+    {
+      "postId": 1,
+      "id": 2,
+      "name": "Reiciendis Earum",
+      "salary": "1200",
+      "age": "26"
+    },
+    {
+      "postId": 1,
+      "id": 3,
+      "name": "Adipisci Animi",
+      "salary": "3500",
+      "age": "55"
+    },
+    {
+      "postId": 1,
+      "id": 4,
+      "name": "Alias Sit",
+      "salary": "2100",
+      "age": "42"
+    },
+    {
+      "postId": 1,
+      "id": 5,
+      "name": "Vero Eaque",
+      "salary": "4243",
+      "age": "47"
+    }
+  ]
diff --git a/automatedtesting/postman/TestSuite.Regression.json b/automatedtesting/postman/TestSuite.Regression.json
@@ -0,0 +1,37 @@
+[
+    {
+      "postId": 1,
+      "id": 1,
+      "name": "Labore Laborum",
+      "salary": "1000",
+      "age": "34"
+    },
+    {
+      "postId": 1,
+      "id": 2,
+      "name": "Reiciendis Earum",
+      "salary": "1200",
+      "age": "26"
+    },
+    {
+      "postId": 1,
+      "id": 3,
+      "name": "Adipisci Animi",
+      "salary": "3500",
+      "age": "55"
+    },
+    {
+      "postId": 1,
+      "id": 4,
+      "name": "Alias Sit",
+      "salary": "2100",
+      "age": "42"
+    },
+    {
+      "postId": 1,
+      "id": 5,
+      "name": "Vero Eaque",
+      "salary": "4243",
+      "age": "47"
+    }
+  ]
diff --git a/automatedtesting/selenium/add_remove_from_cart.py b/automatedtesting/selenium/add_remove_from_cart.py
@@ -0,0 +1,8 @@
+# #!/usr/bin/env python
+from selenium import webdriver
+from selenium.webdriver.chrome.options import Options as ChromeOptions
+
+# Start the browser and navigate to webpage
+driver = webdriver.Chrome()
+driver.get('https://wswebapplication-appservice.azurewebsites.net/automatedtesting/selenium/login.py')
+#driver.get(https://wswebapplication-appservice.azurewebsites.net/automatedtesting/selenium/login.py')
diff --git a/automatedtesting/selenium/login.py b/automatedtesting/selenium/login.py
@@ -7,9 +7,9 @@
 def login (user, password):
     print ('Starting the browser...')
     # --uncomment when running in Azure DevOps.
-    # options = ChromeOptions()
-    # options.add_argument("--headless") 
-    # driver = webdriver.Chrome(options=options)
+    options = ChromeOptions()
+    options.add_argument("--headless") 
+    driver = webdriver.Chrome(options=options)
     driver = webdriver.Chrome()
     print ('Browser started successfully. Navigating to the demo page to login.')
     driver.get('https://www.saucedemo.com/')

diff --git a/automatedtesting/selenium/selenium-output.txt b/automatedtesting/selenium/selenium-output.txt
diff --git a/automatedtesting/selenium/selenium.log b/automatedtesting/selenium/selenium.log
diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml
@@ -9,15 +9,16 @@ trigger:
 # ToDo: Replace the agent pool name, if you are using Udacity Cloud lab. 
 # Otherwise, comment out the line below. 
 pool: myAgentPool
+#pool: "Azure Pipelines"
 
 variables:
   python.version: '3.7.6'
   # ToDo: Replace the service connection name as used in the DevOps project settings
-  azureServiceConnectionId: 'myServiceConnection'
+  azureServiceConnectionId: 'AzureRMconn3' #'myServiceConnection'
   # Project root folder. Point to the folder containing manage.py file.
   projectRoot: $(System.DefaultWorkingDirectory)
   # Environment name
-  environmentName: 'test'
+  environmentName: 'linux-test3'
 
 stages:
 #--------------------------------------------#  
@@ -33,7 +34,8 @@ stages:
     - task: ms-devlabs.custom-terraform-tasks.custom-terraform-installer-task.TerraformInstaller@0
       displayName: 'Terrafom installation'
       inputs:
-        terraformVersion: '1.2.9'
+#        terraformVersion: '1.2.9'
+        terraformVersion: 'latest'
 
     # Run Terraform Init on the pipeline agent 
     # ToDo: Replace the resource group name, storage account name, and container name below
@@ -44,9 +46,9 @@ stages:
         command: 'init'
         workingDirectory: '$(System.DefaultWorkingDirectory)/terraform/environments/test'
         backendServiceArm: '$(azureServiceConnectionId)'
-        backendAzureRmResourceGroupName: ''
-        backendAzureRmStorageAccountName: ''
-        backendAzureRmContainerName: ''
+        backendAzureRmResourceGroupName: 'Azuredevops2'
+        backendAzureRmStorageAccountName: 'tfstate635024562'
+        backendAzureRmContainerName: 'tfstate'
         backendAzureRmKey: 'test.terraform.tfstate'
 
     - task: ms-devlabs.custom-terraform-tasks.custom-terraform-release-task.TerraformTaskV3@3
@@ -121,9 +123,9 @@ stages:
       inputs:
         testResultsFormat: 'JUnit'
         testResultsFiles: '**/TEST-*.xml'
-        searchFolder:       # ToDo
+        searchFolder:  '$(System.DefaultWorkingDirectory)'     # ToDo
         mergeTestResults: true
-        testRunTitle:       # ToDo
+        testRunTitle:  Test_Demo     # ToDo
 
     #--------------------------------------------#
     # Selenium (UI) Test Suite - Archive the package  
@@ -146,7 +148,7 @@ stages:
     - task: ArchiveFiles@2
       displayName: 'Archive FakeRestAPI'
       inputs:
-        rootFolderOrFile: 
+        rootFolderOrFile:
         includeRootFolder: false
         archiveType: 'zip'
         archiveFile: '$(Build.ArtifactStagingDirectory)/$(Build.BuildId)-fakerestapi.zip'
@@ -179,46 +181,53 @@ stages:
   # ToDo: Provide <environment name> you created in your DevOps project
   - deployment: FakeRestAPI
     pool:
-      vmImage: 'Ubuntu-18.04'      
-    environment: <environment name>   # ToDo
+      vmImage: 'Ubuntu-20.04'      
+    environment: '$(environmentName)'  # ToDo
     strategy:
       runOnce:
         deploy:
           steps:
           - task: AzureWebApp@1
             displayName: 'Deploy Azure Web App'
             inputs:
-              azureSubscription: ''     # ToDo
-              appName: ''               # ToDo
+              azureSubscription: 'AzureRMconn3'     # ToDo
+              appName: 'wswebApplication-AppService'               # ToDo
               appType: webApp
-              package: $(Pipeline.Workspace)/<artifact>/<archiveFile>       # ToDo: Use the published zip artifact. 
+#              package: $(Build.ArtifactStagingDirectory)/$(Build.BuildId)-fakerestapi.zip       # ToDo: Use the published zip artifact. 
+              package: $(Pipeline.Workspace)/drop-fakerestapi/$(Build.BuildId)-fakerestapi.zip       # ToDo: Use the published zip artifact. 
+#              package: $(Pipeline.Workspace)/a/$(Build.BuildId)-fakerestapi.zip       # ToDo: Use the published zip artifact. 
+#              package: $(Pipeline.Workspace)/<artifact>/<archiveFile>       # ToDo: Use the published zip artifact. 
           #--------------------------------------------#    
           # Run JMeter test suite against the App Service
           - task: CmdLine@2
             inputs:
               script: |
-                wget "https://apache.mirrors.lucidnetworks.net//jmeter/binaries/apache-jmeter-5.2.1.tgz"
-                tar -xf apache-jmeter-5.2.1.tgz
+                wget "https://dlcdn.apache.org//jmeter/binaries/apache-jmeter-5.6.tgz"
+                tar -xf apache-jmeter-5.6.tgz
                 unzip -o $(Build.BuildId)-perftests.zip
-                ./apache-jmeter-5.2.1/bin/jmeter -n -t PerformanceTestSuite.jmx -j jmeter.log -f
+                ./apache-jmeter-5.6/bin/jmeter -n -t automatedtesting/jmeter/PerformanceTestSuite.jmx -j jmeter.log -f
                 cat jmeter.log                                                                           # ToDo: Write your commands
-              workingDirectory: $(Pipeline.Workspace)/<artifact>            # ToDo: Use the artifact name from the task above
+              workingDirectory: $(Pipeline.Workspace)/drop-perftests          # ToDo: Use the artifact name from the task above
+#              workingDirectory: $(Pipeline.Workspace)/drop-fakerestapi          # ToDo: Use the artifact name from the task above
+#              workingDirectory: $(Pipeline.Workspace)/<artifact>            # ToDo: Use the artifact name from the task above
 
   #--------------------------------------------#  
   # Selenium | Functional UI Tests
   # ToDo: 
   - deployment: VMDeploy
-    displayName: Selenium Tests
+    displayName: Selenium UI Tests
     environment:
-      name:         # ToDo: Change/provide a name
+      name: '$(environmentName)'
       resourceType: VirtualMachine
+#      name: "linux-test"       # ToDo: Change/provide a name
+#      resourceType: VirtualMachine
       tags: selenium
     strategy:
       runOnce:
         deploy:
           steps:
           - download: current
-            artifact: drop-ui-tests     # ToDo: Change/provide a name
+            artifact: drop-uitests     # ToDo: Change/provide a name
 
           - task: Bash@3
             inputs:
@@ -232,21 +241,21 @@ stages:
                 sudo apt-get install -y chromium-browser
                 pip3 install selenium
                 cd ~/
-                DIR=/home/testuser/app
+                DIR=/home/adminuser/app
                 if [ ! -d "$DIR" ]; then
                     mkdir app
                 fi
-                mv /home/testuser/azagent/_work/1/drop-uitests/$(Build.BuildId)-uitests.zip app
+                mv /home/adminuser/azagent/_work/1/drop-uitests/$(Build.BuildId)-uitests.zip app
                 cd app
                 unzip -o $(Build.BuildId)-uitests.zip
-                FILE=/home/testuser/app/chromedriver_linux64.zip
+                FILE=/home/adminuser/app/chromedriver_linux64.zip
                 if [ ! -f "$FILE" ]; then
                     LATEST=$(wget -q -O - http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
                     wget http://chromedriver.storage.googleapis.com/$LATEST/chromedriver_linux64.zip
                     unzip -o chromedriver_linux64.zip
                     sudo ln -s $PWD/chromedriver /usr/local/bin/chromedriver
                 fi
-                export PATH=$PATH:/home/testuser/app
+                export PATH=$PATH:/home/adminuser/app
                 echo "Starting Selenium Tests"
                 python3 add_remove_from_cart.py >> selenium.log
                 echo "Completed Selenium Tests. Check selenium.log for results."
diff --git a/terraform/environments/test/.terraform.lock.hcl b/terraform/environments/test/.terraform.lock.hcl
diff --git a/terraform/environments/test/configure-tfstate-storage-account.sh_OLD b/terraform/environments/test/configure-tfstate-storage-account.sh_OLD
@@ -0,0 +1,23 @@
+#!/bin/bash
+RESOURCE_GROUP_NAME="Azuredevops"
+STORAGE_ACCOUNT_NAME="tfstate$RANDOM$RANDOM"
+CONTAINER_NAME="tfstate"
+
+# This command is not needed in the Udacity provided Azure account. 
+# Create resource group
+# az group create --name $RESOURCE_GROUP_NAME --location eastus
+
+# Create storage account
+az storage account create --resource-group $RESOURCE_GROUP_NAME --name $STORAGE_ACCOUNT_NAME --sku Standard_LRS --encryption-services blob
+
+# Get storage account key
+ACCOUNT_KEY=$(az storage account keys list --resource-group $RESOURCE_GROUP_NAME --account-name $STORAGE_ACCOUNT_NAME --query '[0].value' -o tsv)
+export ARM_ACCESS_KEY=$ACCOUNT_KEY
+
+# Create blob container
+az storage container create --name $CONTAINER_NAME --account-name $STORAGE_ACCOUNT_NAME --account-key $ACCOUNT_KEY
+echo "RESOURCE_GROUP_NAME=$RESOURCE_GROUP_NAME"
+echo "STORAGE_ACCOUNT_NAME=$STORAGE_ACCOUNT_NAME"
+echo "CONTAINER_NAME=$CONTAINER_NAME"
+echo "ACCOUNT_KEY=$ACCOUNT_KEY"
+
diff --git a/terraform/environments/test/input.tf b/terraform/environments/test/input.tf
@@ -7,10 +7,14 @@ variable "tenant_id" {}
 # Resource Group/Location
 variable "location" {}
 variable "resource_group" {}
+variable "resource_group_name" {}
 variable "application_type" {}
 
 # Network
 variable virtual_network_name {}
 variable address_prefix_test {}
+variable address_prefixes_test {}
 variable address_space {}
 
+# VM
+#variable subnet_id {}
diff --git a/terraform/environments/test/main.tf b/terraform/environments/test/main.tf
@@ -5,36 +5,42 @@ provider "azurerm" {
   client_secret   = "${var.client_secret}"
   features {}
 }
+
 terraform {
   backend "azurerm" {
-    storage_account_name = ""
-    container_name       = ""
-    key                  = ""
-    access_key           = ""
+    storage_account_name = "tfstate635024562"
+    container_name       = "tfstate"
+    key                  = "test.terraform.tfstate"
+    access_key           = "qXly88km6RjjLdisH+W+rvJxRQCqLOjuAGVd1AdZ0SfFvNsjuYJ/mYU2UzpHe2pl6hr0Ncsbu5cg+AStAEYcag=="
   }
 }
-module "resource_group" {
-  source               = "../../modules/resource_group"
-  resource_group       = "${var.resource_group}"
-  location             = "${var.location}"
-}
+
+#module "resource_group" {
+#  source               = "../../modules/resource_group"
+#  resource_group       = "${var.resource_group}"
+#  location             = "${var.location}"
+#}
+
 module "network" {
   source               = "../../modules/network"
   address_space        = "${var.address_space}"
   location             = "${var.location}"
   virtual_network_name = "${var.virtual_network_name}"
   application_type     = "${var.application_type}"
   resource_type        = "NET"
-  resource_group       = "${module.resource_group.resource_group_name}"
+#  resource_group       = "${module.resource_group.resource_group_name}"
+  resource_group    = "${var.resource_group}"
   address_prefix_test  = "${var.address_prefix_test}"
+  address_prefixes_test  = "${var.address_prefixes_test}"
 }
 
 module "nsg-test" {
   source           = "../../modules/networksecuritygroup"
   location         = "${var.location}"
   application_type = "${var.application_type}"
   resource_type    = "NSG"
-  resource_group   = "${module.resource_group.resource_group_name}"
+#  resource_group   = "${module.resource_group.resource_group_name}"
+  resource_group    = "${var.resource_group}"
   subnet_id        = "${module.network.subnet_id_test}"
   address_prefix_test = "${var.address_prefix_test}"
 }
@@ -43,12 +49,22 @@ module "appservice" {
   location         = "${var.location}"
   application_type = "${var.application_type}"
   resource_type    = "AppService"
-  resource_group   = "${module.resource_group.resource_group_name}"
+  resource_group    = "${var.resource_group}"
+#  resource_group   = "${module.resource_group.resource_group_name}"
 }
 module "publicip" {
   source           = "../../modules/publicip"
   location         = "${var.location}"
   application_type = "${var.application_type}"
   resource_type    = "publicip"
-  resource_group   = "${module.resource_group.resource_group_name}"
+  resource_group    = "${var.resource_group}"
+}
+module "vm" {
+  source           = "../../modules/vm"
+  location         = "${var.location}"
+  application_type = "${var.application_type}"
+  resource_type    = "VM"
+  resource_group   = "${var.resource_group}"
+  subnet_id        = "${module.network.subnet_id_test}"
+  public_ip_address_id          = "${module.publicip.public_ip_address_id}" 
 }