From 4d820a3076a0f6e605f8f44bf9807b1ed60305db Mon Sep 17 00:00:00 2001
From: Michal Kovarik <mkovarik@redhat.com>
Date: Apr 02 2020 09:33:03 +0000
Subject: C3I-99: add missing quotes and null pointer checks


---

diff --git a/roles/c3i/templates/greenwave-promote.Jenkinsfile b/roles/c3i/templates/greenwave-promote.Jenkinsfile
index b564224..07052b2 100644
--- a/roles/c3i/templates/greenwave-promote.Jenkinsfile
+++ b/roles/c3i/templates/greenwave-promote.Jenkinsfile
@@ -45,14 +45,14 @@ pipeline {
           } else if (!params.IMAGE) {
             // Triggred by CI_MESSAGE but it's empty - CID-5291
             if (!currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause')) {
-              def datagrepperdata = sh(returnStdout: true, script: "curl -k {{ c3i_datagrepper_url }}/raw?delta=300&topic=/topic/{{ c3i_messaging_greenwave_topic_virtualtopic_part }}&contains=${params.DECISION_CONTEXT_REGEX}")
+              def datagrepperdata = sh(returnStdout: true, script: "curl -k '{{ c3i_datagrepper_url }}/raw?delta=300&topic=/topic/{{ c3i_messaging_greenwave_topic_virtualtopic_part }}&contains=${params.DECISION_CONTEXT_REGEX}'")
               def messages = readJSON text: datagrepperdata
               messages.raw_messages.any {
                 def msg = it.msg
-                if ( msg?.decision_context.find(/${env.DECISION_CONTEXT_REGEX}/) &&
+                if ( msg?.decision_context?.find(/${env.DECISION_CONTEXT_REGEX}/) &&
                      msg?.subject_type == 'container-image' &&
                      msg?.policies_satisfied == true &&
-                     msg?.subject_identifier.find(/${env.SUBJECT_IDENTIFIER_REGEX}/)
+                     msg?.subject_identifier?.find(/${env.SUBJECT_IDENTIFIER_REGEX}/)
                    ){
                   def digest = (msg.subject_identifier =~ /@(sha256:\w+)$/)[0][1]
                   env.IMAGE = "${params.SOURCE_CONTAINER_REPO}@${digest}"
diff --git a/roles/c3i/templates/trigger-on-tag.Jenkinsfile b/roles/c3i/templates/trigger-on-tag.Jenkinsfile
index 60836d0..4fe2f89 100644
--- a/roles/c3i/templates/trigger-on-tag.Jenkinsfile
+++ b/roles/c3i/templates/trigger-on-tag.Jenkinsfile
@@ -34,7 +34,7 @@ pipeline {
           } else {
             // Triggred by CI_MESSAGE but it's empty - CID-5291
             if (!currentBuild.getBuildCauses('hudson.model.Cause$UserIdCause')) {
-              def datagrepperdata = sh(returnStdout: true, script: "curl -k {{ c3i_datagrepper_url }}/raw?delta=300&category=repotracker&contains=${params.TRACKED_CONTAINER_REPO}")
+              def datagrepperdata = sh(returnStdout: true, script: "curl -k '{{ c3i_datagrepper_url }}/raw?delta=300&category=repotracker&contains=${params.TRACKED_CONTAINER_REPO}'")
               def messages = readJSON text: datagrepperdata
               messages.raw_messages.any {
                 def msg = it.msg