Merge pull request #16 from ServiceNow/scratch/release_6.1.0

Author: manoharreddydavired

README.md

@@ -2,7 +2,6 @@
 
  New repository for developing a plugin to integrate between ITSM DevOps and GitLab pipelines
 
-
 # CLI example using npm modules
 
 ## Build and install

github-ci.yml

@@ -48,7 +48,7 @@ jobs:
        runs-on: ubuntu-latest
        needs: ServiceNowDevOpsChange
        container:
-         image: servicenowdocker/sndevops:6.0.0
+         image: servicenowdocker/sndevops:6.1.0
        env:
          CI_JOB_NAME: "ServiceNowDevOpsChange"
 
@@ -61,7 +61,7 @@ jobs:
       runs-on: ubuntu-latest
       needs: build
       container:
-        image: servicenowdocker/sndevops:6.0.0
+        image: servicenowdocker/sndevops:6.1.0
       env:
         CI_JOB_NAME: "ArtifactAndPackage"
       steps:
@@ -75,7 +75,7 @@ jobs:
       needs: ArtifactAndPackage
       runs-on: ubuntu-latest
       container:
-        image: servicenowdocker/sndevops:6.0.0
+        image: servicenowdocker/sndevops:6.1.0
       env:
         CI_JOB_NAME: "ServiceNowDevOpsSonarScanResults"
       steps:
@@ -88,7 +88,7 @@ jobs:
       runs-on: ubuntu-latest
       needs: build
       container:
-        image: servicenowdocker/sndevops:6.0.0
+        image: servicenowdocker/sndevops:6.1.0
       steps:
         - name: security scan
           run: |

gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: servicenowdocker/sndevops:6.0.0
+image: servicenowdocker/sndevops:6.1.0
 stages:
   - pre-build
   - build

harness-ci.yml

@@ -45,7 +45,7 @@ pipeline:
                   identifier: Sonar_container
                   spec:
                     connectorRef: docker_connector # harness docker connector
-                    image: servicenowdocker/sndevops:6.0.0
+                    image: servicenowdocker/sndevops:6.1.0
                     command: |-
                       export SNOW_URL="<+variable.SNOW_URL>"
                       export SNOW_TOOLID="<+variable.SNOW_TOOLID>"
@@ -93,7 +93,7 @@ pipeline:
                   identifier: security
                   spec:
                     connectorRef: docker_connector # harness docker connector
-                    image: servicenowdocker/sndevops:6.0.0
+                    image: servicenowdocker/sndevops:6.1.0
                     command: |-
                       export SNOW_URL="<+variable.SNOW_URL>"
                       export SNOW_TOOLID="<+variable.SNOW_TOOLID>"
@@ -156,7 +156,7 @@ pipeline:
                   identifier: ServiceNow_change
                   spec:
                     connectorRef: docker_connector # harness docker connector
-                    image: servicenowdocker/sndevops:6.0.0
+                    image: servicenowdocker/sndevops:6.1.0
                     command: |-
                       # set mandetory variables. These can be set from Environment variable section of Optional configuration as well.
                       export HARNESS_STAGE_NAME="<+stage.identifier>"

package-lock.json

@@ -13,7 +13,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "axios": "^1.6.8",
+    "axios": "^1.7.4",
     "commander": "^11.0.0",
     "dotenv": "^16.3.1"
   }

package.json

@@ -22,7 +22,6 @@ class ChangeRequestManager extends SnDevopsApi {
        }
      */
     async createChange(pipelineContext, changeAttrPayload) {
-        let status = true;
         let response;
         let changePayload; //Payload contains information necessary for change creation
         let changeDetails; //Incoming payload after JSON parsed
@@ -77,7 +76,22 @@ class ChangeRequestManager extends SnDevopsApi {
 
             let payload = this._getRequestBodyForChangeCreation(changePayload, pipelineContext);
             response = await this.createChangeNotification(payload);
-            if (status) {
+            if (response) {
+                var result = response.data.result;
+                if (result && result.pipelineTracked === 'false') {
+                    console.log("Change request cannot be created as pipeline is configured to NOT track in the servicenow instance");
+                    return;
+                }
+
+                if (result && result.status == "Success") {
+                    if (result.changeControl === false)
+                        console.log('\n     \x1b[1m\x1b[36m' + "Change control is not enabled on the pipeline stage" + '\x1b[0m\x1b[0m');
+                    else if (result.message)
+                        console.log('\n     \x1b[1m\x1b[36m' + result.message + '\x1b[0m\x1b[0m');
+                    else
+                        console.log('\n     \x1b[1m\x1b[36m' + "The job is under change control. A callback request is created and polling has been started to retrieve the change info." + '\x1b[0m\x1b[0m');
+                }
+
                 interval = interval >= 100 ? interval : 100;
                 timeout = timeout >= 100 ? timeout : 3600;
 
@@ -91,14 +105,12 @@ class ChangeRequestManager extends SnDevopsApi {
                 }
             }
         } catch (err) {
-            status = false;
             console.error('\n \x1b[1m\x1b[31m' + err.message + '\x1b[0m\x1b[0m');
             process.exit(1);
         }
     }
 
     async createChangeNotification(changePayload) {
-        let status = false;
         let response;
 
         try {
@@ -114,7 +126,6 @@ class ChangeRequestManager extends SnDevopsApi {
             let httpHeaders = { headers: defaultHeadersForToken };
             try {
                 response = await axios.post(url.toString(), JSON.stringify(changePayload), httpHeaders);
-                status = true;
             } catch (err) {
                 if (err.code === 'ECONNABORTED') {
                     throw new Error(`change creation timeout after ${err.config.timeout}s`);
@@ -163,18 +174,7 @@ class ChangeRequestManager extends SnDevopsApi {
                     throw new Error(errMsg);
                 }
             }
-
-            if (status) {
-                var result = response.data.result;
-                if (result && result.status == "Success") {
-                    if (result.changeControl === false)
-                        console.log('\n     \x1b[1m\x1b[36m' + "Change control is not enabled on the pipeline stage" + '\x1b[0m\x1b[0m');
-                    else if (result.message)
-                        console.log('\n     \x1b[1m\x1b[36m' + result.message + '\x1b[0m\x1b[0m');
-                    else
-                        console.log('\n     \x1b[1m\x1b[36m' + "The job is under change control. A callback request is created and polling has been started to retrieve the change info." + '\x1b[0m\x1b[0m');
-                }
-            }
+           return response;
         } catch (error) {
             throw new Error(error.message);
         }