changes for EINVAL issue reported by customer, latest version changes (#96)

* changes for EINVAL issue reported by customer, latest version changes

* adding ubuntu and windows in agents

* changes to put the windows and ubuntu parellely

* minor changes

* console log ahcnage

* some changes for guids.

* some check

* try

* try

* change

* some change

* change for the validation of testName

* no need of runner anyway

* file renames and deleting un-necessary files

* pr comment

* adding a comment

* change comment

* check for the results and reports

* check for directory too.

* try

* negative test to check a stage

* revert negative testing

* pr comments

* nit change in commments

* removing un-used func

* validation file changes.

Author: mohitpavan

.github/workflows/pr_check_load_test.yml

@@ -1,4 +1,4 @@
-name: pr build check
+name: pr build check for some E2E tests
 
 on:
   push:
@@ -13,18 +13,21 @@ on:
       - main
 
 env:
-  LOAD_TEST_RESOURCE: "rbac-test"
-  LOAD_TEST_RESOURCE_GROUP: "radhika-test"
-  COMMIT_ID : ${{ github.sha }}
+  LOAD_TEST_RESOURCE: ${{ secrets.LOAD_TEST_RESOURCE_NAME }}
+  LOAD_TEST_RESOURCE_GROUP: ${{ secrets.LOAD_TEST_RESOURCE_GROUP_NAME }}
+
+permissions:
+  id-token: write # This is required for requesting the JWT
+  contents : read # This is required for actions/checkout
 
 jobs:
   run-integration-test:
     environment: automation test
     name: Validate PR
     strategy:
       matrix:
-        os: [windows-latest]
-        configFile: ['sample-test-url.yaml', 'sample-test-jmx.yaml'] 
+        os: [ubuntu-latest, windows-latest]
+        configFile: ['sample-test-url.yaml', 'sample-test-jmx.yaml']
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -43,13 +46,49 @@ jobs:
 
     - name: Azure authentication
       uses: azure/login@v1
+      continue-on-error: false
       with:
-        creds: ${{ secrets.AZURE_CREDENTIALS }}
-  
+        client-id: ${{ secrets.AZURE_CLIENT_ID }}
+        tenant-id: ${{ secrets.AZURE_TENANT_ID }}
+        subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+
+    - name: Generate GUID
+      id: guid
+      run: |
+          if [[ "${{ runner.os }}" == "Windows" ]]; then
+            echo "::set-output name=GUID::$(powershell -Command "[guid]::NewGuid().ToString()")"
+          else
+            echo "::set-output name=GUID::$(uuidgen)"
+          fi
+      shell : bash
+
+    - name: Set up testName
+      shell: bash
+      run: |
+        # copying the files to a new file and editing the testId for each file in the copied file.
+        # replacing 'testId'(the thing present in the file.) with the new testId ('${{ steps.guid.outputs.GUID }}') in the copied file.
+        cp ${{ matrix.configFile }} test-config-${{ steps.guid.outputs.GUID }}.yaml
+        sed -i 's/testId/${{ steps.guid.outputs.GUID }}/g' test-config-${{ steps.guid.outputs.GUID }}.yaml
+
     - name: 'Azure Load Testing'
       uses: ./
       with:
-        loadTestConfigFile: ${{ matrix.configFile }}
+        loadTestConfigFile: test-config-${{ steps.guid.outputs.GUID }}.yaml
         loadTestResource: ${{ env.LOAD_TEST_RESOURCE }}
         resourceGroup: ${{ env.LOAD_TEST_RESOURCE_GROUP }}
-      
+      continue-on-error: true
+
+    - name: Check for results and report files
+      run: |
+        if [[ -d "./loadTest" ]]; then
+          if [[ -f "./loadTest/results.zip" && -f "./loadTest/report.zip" ]]; then
+            echo "Both results.zip and report.zip files are present."
+          else
+            echo "One or both of the files are missing."
+            exit 1
+          fi
+        else
+          echo "loadTest directory is missing."
+          exit 1
+        fi
+      shell: bash

lib/main.js

@@ -34,15 +34,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExistingEnv = exports.getExistingParams = exports.getExistingCriteria = void 0;
 const core = __importStar(require("@actions/core"));
-const httpc = require("typed-rest-client/HttpClient");
 const map = __importStar(require("./mappers"));
 const util = __importStar(require("./util"));
 const fs = __importStar(require("fs"));
 const util_1 = require("util");
 const util_2 = require("./util");
 const resultFolder = 'loadTest';
+const reportZipFileName = 'report.zip';
+const resultZipFileName = 'results.zip';
 let baseURL = '';
-const httpClient = new httpc.HttpClient('MALT-GHACTION');
 let testId = '';
 let existingCriteria = {};
 let existingParams = {};
@@ -74,8 +74,9 @@ function run() {
     });
 }
 function getTestAPI(validate) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
-        var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.latestVersion;
         urlSuffix = baseURL + urlSuffix;
         let header = yield map.getTestHeader();
         let testResult = yield util.httpClientRetries(urlSuffix, header, 'get', 3, "");
@@ -85,10 +86,21 @@ function getTestAPI(validate) {
                 + "https://docs.microsoft.com/azure/load-testing/tutorial-cicd-github-actions#configure-the-github-actions-workflow-to-run-a-load-test ";
             throw new Error(message);
         }
-        if (testResult.message.statusCode != 200 && testResult.message.statusCode != 201 && testResult.message.statusCode != 404) {
-            let testObj = yield util.getResultObj(testResult);
-            console.log(testObj ? testObj : util.ErrorCorrection(testResult));
-            throw new Error("Error in getting the test.");
+        if (testResult.message.statusCode != 200 && testResult.message.statusCode != 201) {
+            if (validate) { // validate is called, then get should not be false, and this validate had retries because of the conflicts in jmx test, so lets not print in the console, instead put this in the error itself.
+                let testObj = yield util.getResultObj(testResult);
+                let err = ((_a = testObj === null || testObj === void 0 ? void 0 : testObj.error) === null || _a === void 0 ? void 0 : _a.message) ? (_b = testObj === null || testObj === void 0 ? void 0 : testObj.error) === null || _b === void 0 ? void 0 : _b.message : util.ErrorCorrection(testResult);
+                throw new Error(err);
+            }
+            else if (!validate && testResult.message.statusCode != 404) { // if not validate, then its to check if it is edit or create thats all, so it should not throw the error for 404.
+                let testObj = yield util.getResultObj(testResult);
+                console.log(testObj ? testObj : util.ErrorCorrection(testResult));
+                throw new Error("Error in getting the test.");
+            }
+            // note : kumarmoh 
+            /// else {
+            //    do nothing if the validate = false and status code is 404, as it is for create test.
+            // } this is just for comment
         }
         if (testResult.message.statusCode == 200) {
             let testObj = yield util.getResultObj(testResult);
@@ -115,7 +127,7 @@ function getTestAPI(validate) {
 }
 function deleteFileAPI(filename) {
     return __awaiter(this, void 0, void 0, function* () {
-        var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.latestVersion;
         urlSuffix = baseURL + urlSuffix;
         let header = yield map.getTestHeader();
         let delFileResult = yield util.httpClientRetries(urlSuffix, header, 'del', 3, "");
@@ -128,7 +140,7 @@ function deleteFileAPI(filename) {
 }
 function createTestAPI() {
     return __awaiter(this, void 0, void 0, function* () {
-        var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.latestVersion;
         urlSuffix = baseURL + urlSuffix;
         var createData = map.createTestData();
         let header = yield map.createTestHeader();
@@ -191,7 +203,7 @@ function uploadTestPlan() {
         let retry = 5;
         let filepath = map.getTestFile();
         let filename = map.getFileName(filepath);
-        var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.latestVersion;
         if (map.getTestKind() == util_2.TestKind.URL) {
             urlSuffix = urlSuffix + ("&fileType=" + FileType.URL_TEST_CONFIG);
         }
@@ -209,14 +221,14 @@ function uploadTestPlan() {
             var startTime = new Date();
             var maxAllowedTime = new Date(startTime.getTime() + minutesToAdd * 60000);
             var validationStatus = "VALIDATION_INITIATED";
-            while (maxAllowedTime > (new Date()) && (validationStatus == "VALIDATION_INITIATED" || validationStatus == "NOT_VALIDATED")) {
+            while (maxAllowedTime > (new Date()) && (validationStatus == "VALIDATION_INITIATED" || validationStatus == "NOT_VALIDATED" || validationStatus == null)) {
                 try {
                     validationStatus = yield getTestAPI(true);
                 }
                 catch (e) {
                     retry--;
                     if (retry == 0) {
-                        throw new Error("Unable to validate the test plan. Please retry.");
+                        throw new Error("Unable to validate the test plan. Please retry. Failed with error :" + e);
                     }
                 }
                 yield util.sleep(5000);
@@ -238,7 +250,7 @@ function uploadConfigFile() {
         if (configFiles != undefined && configFiles.length > 0) {
             for (let filepath of configFiles) {
                 let filename = map.getFileName(filepath);
-                var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+                var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.latestVersion;
                 urlSuffix = baseURL + urlSuffix;
                 let headers = yield map.UploadAndValidateHeader();
                 let uploadresult = yield util.httpClientRetries(urlSuffix, headers, 'put', 3, filepath, true);
@@ -254,14 +266,14 @@ function uploadConfigFile() {
     });
 }
 function uploadZipArtifacts() {
+    var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         let zipFiles = map.getZipFiles();
         if (zipFiles != undefined && zipFiles.length > 0) {
             console.log("Uploading and validating the zip artifacts");
             for (let filepath of zipFiles) {
                 let filename = map.getFileName(filepath);
-                var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.tm20240301previewVersion + "&fileType=" + FileType.ZIPPED_ARTIFACTS;
+                var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.latestVersion + "&fileType=" + FileType.ZIPPED_ARTIFACTS;
                 urlSuffix = baseURL + urlSuffix;
                 let headers = yield map.UploadAndValidateHeader();
                 let uploadresult = yield util.httpClientRetries(urlSuffix, headers, 'put', 3, filepath, true);
@@ -278,11 +290,15 @@ function uploadZipArtifacts() {
             let zipInvalid = false;
             let zipFailureReason = "";
             while (maxAllowedTime > (new Date()) && flagValidationPending) {
-                var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+                var urlSuffix = "tests/" + testId + "?api-version=" + util.apiConstants.latestVersion;
                 urlSuffix = baseURL + urlSuffix;
                 let header = yield map.getTestHeader();
                 let testResult = yield util.httpClientRetries(urlSuffix, header, 'get', 3, "");
                 let testObj = yield util.getResultObj(testResult);
+                if (testResult.message.statusCode != 200 && testResult.message.statusCode != 201) {
+                    console.log(testObj ? testObj : util.ErrorCorrection(testResult));
+                    throw new Error("Error in getting the test.");
+                }
                 flagValidationPending = false;
                 if (testObj && testObj.inputArtifacts && testObj.inputArtifacts.additionalFileInfo) {
                     for (const file of testObj.inputArtifacts.additionalFileInfo) {
@@ -324,7 +340,7 @@ function uploadPropertyFile() {
         let propertyFile = map.getPropertyFile();
         if (propertyFile != undefined) {
             let filename = map.getFileName(propertyFile);
-            var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.tm20240301previewVersion + "&fileType=" + FileType.USER_PROPERTIES;
+            var urlSuffix = "tests/" + testId + "/files/" + filename + "?api-version=" + util.apiConstants.latestVersion + "&fileType=" + FileType.USER_PROPERTIES;
             urlSuffix = baseURL + urlSuffix;
             let headers = yield map.UploadAndValidateHeader();
             let uploadresult = yield util.httpClientRetries(urlSuffix, headers, 'put', 3, propertyFile);
@@ -342,7 +358,7 @@ function createTestRun() {
     return __awaiter(this, void 0, void 0, function* () {
         const tenantId = map.getTenantId();
         const testRunId = util.getUniqueId();
-        var urlSuffix = "test-runs/" + testRunId + "?tenantId=" + tenantId + "&api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "test-runs/" + testRunId + "?tenantId=" + tenantId + "&api-version=" + util.apiConstants.latestVersion;
         urlSuffix = baseURL + urlSuffix;
         const ltres = core.getInput('loadTestResource');
         const runDisplayName = core.getInput('loadTestRunName');
@@ -378,21 +394,24 @@ function createTestRun() {
 }
 function getTestRunAPI(testRunId, testStatus, startTime) {
     return __awaiter(this, void 0, void 0, function* () {
-        var urlSuffix = "test-runs/" + testRunId + "?api-version=" + util.apiConstants.tm20240301previewVersion;
+        var urlSuffix = "test-runs/" + testRunId + "?api-version=" + util.apiConstants.latestVersion;
         urlSuffix = baseURL + urlSuffix;
         while (!util.isTerminalTestStatus(testStatus)) {
             let header = yield map.getTestRunHeader();
             let testRunResult = yield util.httpClientRetries(urlSuffix, header, 'get', 3, "");
             let testRunObj = yield util.getResultObj(testRunResult);
-            if (testRunObj == null) {
-                throw new Error(util.ErrorCorrection(testRunResult));
+            if (testRunResult.message.statusCode != 200 && testRunResult.message.statusCode != 201) {
+                console.log(testRunObj ? testRunObj : util.ErrorCorrection(testRunResult));
+                throw new Error("Error in getting the test run");
             }
             testStatus = testRunObj.status;
             if (util.isTerminalTestStatus(testStatus)) {
                 let vusers = null;
                 let count = 0;
+                let reportsAvailable = false;
+                console.log("Test run completed. Polling for statistics and dashboard report to populate.");
                 // Polling for max 3 min for statistics and pass fail criteria to populate
-                while ((0, util_1.isNullOrUndefined)(vusers) && count < 18) {
+                while ((!reportsAvailable || (0, util_1.isNullOrUndefined)(vusers)) && count < 18) {
                     yield util.sleep(10000);
                     let header = yield map.getTestRunHeader();
                     let testRunResult = yield util.httpClientRetries(urlSuffix, header, 'get', 3, "");
@@ -401,12 +420,15 @@ function getTestRunAPI(testRunId, testStatus, startTime) {
                         throw new Error(util.ErrorCorrection(testRunResult));
                     }
                     if (testRunResult.message.statusCode != 200 && testRunResult.message.statusCode != 201) {
-                        let testRunObj = yield util.getResultObj(testRunResult);
                         console.log(testRunObj ? testRunObj : util.ErrorCorrection(testRunResult));
-                        throw new Error("Error in getting the test-run");
+                        throw new Error("Error in getting the test run");
                     }
                     vusers = testRunObj.virtualUsers;
                     count++;
+                    let testReport = util.getReportFolder(testRunObj.testArtifacts);
+                    if (testReport) {
+                        reportsAvailable = true;
+                    }
                 }
                 if (testRunObj && testRunObj.startDateTime) {
                     startTime = new Date(testRunObj.startDateTime);
@@ -420,16 +442,28 @@ function getTestRunAPI(testRunId, testStatus, startTime) {
                     util.printCriteria(testRunObj.passFailCriteria.passFailMetrics);
                 if (testRunObj.testRunStatistics != null)
                     util.printClientMetrics(testRunObj.testRunStatistics);
-                var testResultUrl = util.getResultFolder(testRunObj.testArtifacts);
+                let testResultUrl = util.getResultFolder(testRunObj.testArtifacts);
                 if (testResultUrl != null) {
-                    const response = yield util.httpClientRetries(testResultUrl, { 'content-type': 'application/merge-patch+json' }, 'get', 3, "");
+                    const response = yield util.httpClientRetries(testResultUrl, {}, 'get', 3, "");
                     if (response.message.statusCode != 200) {
                         let respObj = yield util.getResultObj(response);
                         console.log(respObj ? respObj : util.ErrorCorrection(response));
                         throw new Error("Error in fetching results ");
                     }
                     else {
-                        yield util.getResultsFile(response);
+                        yield util.uploadFileToResultsFolder(response, resultZipFileName);
+                    }
+                }
+                let testReportUrl = util.getReportFolder(testRunObj.testArtifacts);
+                if (testReportUrl != null) {
+                    const response = yield util.httpClientRetries(testReportUrl, {}, 'get', 3, "");
+                    if (response.message.statusCode != 200) {
+                        let respObj = yield util.getResultObj(response);
+                        console.log(respObj ? respObj : util.ErrorCorrection(response));
+                        throw new Error("Error in fetching report ");
+                    }
+                    else {
+                        yield util.uploadFileToResultsFolder(response, reportZipFileName);
                     }
                 }
                 if (testRunObj.status === "FAILED" || testRunObj.status === "CANCELLED") {