conjur-debify 3.0.3.pre.145 → 3.0.3.pre.216

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749d66a8a64cbc22abc88af81e4f1851ee888d178c875d8c384da86e9c84a472
-  data.tar.gz: 7d0713e5b38339ce6ac39d4c6714593d00ace8f6515e8c8d3f5b0914a2a14d48
+  metadata.gz: a67cda7bff727c277d5265ce52db2bff433d1037f00127c89f0d3741cb4fd301
+  data.tar.gz: 44fcf54fc677d908deed4a07bad5d4c2a7275a3e0e659db5538c0dce42f9de5d
 SHA512:
-  metadata.gz: '07198fe9a64df0947c30bf59ec95af4c63ca81abbfc7dff9d46188b480f21e373bbcccdd84ff3be97b0c37d41db7dd4f05f34ed82376de62f28206c23423c2b0'
-  data.tar.gz: 2ac3dc9e0bbda1d32a046fcd376f5b8aabf24df4b1a09695a3300e935e3d4ed8ab301e0cf6ae8a1af12c8de84554375b9971d92deec45011fc1e67f357e41314
+  metadata.gz: 9675f380f690a261d7c9f1cd76045600745f92dc4ad1388b9f462ebb3c5ed36a1d11ad3c5be937a40ee3afbc9f595557d6f74ed91e0cb0c044f2153b0543df9e
+  data.tar.gz: 05767c19f4e97a04c71da31c2a8d0e7079a2b979b19a48779ce625e8351b6c8a44066362ee939b579c03058177f21a6eda0ad59379728e56b33cf9000a13d6b9

data/Jenkinsfile

@@ -1,5 +1,10 @@
 #!/usr/bin/env groovy
 
+@Library("product-pipelines-shared-library") _
+
+def productName = 'Debify'
+def productTypeName = 'Conjur Internal'
+
 // Automated release, promotion and dependencies
 properties([
   // Include the automated release parameters for the build
@@ -16,6 +21,33 @@ if (params.MODE == "PROMOTE") {
     // Any publishing of targetVersion artifacts occur here
     // Anything added to assetDirectory will be attached to the Github Release
 
+    env.INFRAPOOL_PRODUCT_NAME = "${productName}"
+    env.INFRAPOOL_DD_PRODUCT_TYPE_NAME = "${productTypeName}"
+
+    def scans = [:]
+
+    scans["AMD64"] = {
+      stage("Scan Docker image (AMD64 based)") {
+        runSecurityScans(infrapool,
+          image: "registry.tld/conjurinc/debify:${sourceVersion}-amd64",
+          buildMode: params.MODE,
+          branch: env.BRANCH_NAME,
+          architecure: 'linux/amd64')
+      }
+    }
+
+    scans["ARM64"] = {
+      stage("Scan Docker image (ARM64 based)") {
+        runSecurityScans(infrapool,
+          image: "registry.tld/conjurinc/debify:${sourceVersion}-arm64",
+          buildMode: params.MODE,
+          branch: env.BRANCH_NAME,
+          architecure: 'linux/arm64')
+      }
+    }
+
+    parallel(scans)
+
     //Note: assetDirectory is on the infrapool agent, not the local Jenkins agent.
     infrapool.agentSh './publish-rubygem.sh'
   }
@@ -38,6 +70,10 @@ pipeline {
   environment {
     // Sets the MODE to the specified or autocalculated value as appropriate
     MODE = release.canonicalizeMode()
+
+    // Values to direct scan results to the right place in DefectDojo
+    INFRAPOOL_PRODUCT_NAME = "${productName}"
+    INFRAPOOL_DD_PRODUCT_TYPE_NAME = "${productTypeName}"
   }
 
   stages {
@@ -103,82 +139,77 @@ pipeline {
         }
       }
     }
-    stage('Scan Docker image') {
+    stage('Push Docker image') {
       parallel {
-        stage('Scan Docker image for fixable issues (AMD64 based)') {
-          steps{
-            script {
-              VERSION = INFRAPOOL_EXECUTORV2_AGENT_0.agentSh(returnStdout: true, script: 'cat VERSION')
-            }
-            scanAndReport(INFRAPOOL_EXECUTORV2_AGENT_0, "debify:${VERSION}", "HIGH", false)
-          }
-        }
-        stage('Scan Docker image for all issues (AMD64 based)') {
-          steps{
-            script {
-              VERSION = INFRAPOOL_EXECUTORV2_AGENT_0.agentSh(returnStdout: true, script: 'cat VERSION')
-            }
-            scanAndReport(INFRAPOOL_EXECUTORV2_AGENT_0, "debify:${VERSION}", "NONE", true)
-          }
-        }
-        stage('Scan Docker image for fixable issues (ARM64 based)') {
-          steps{
+        stage('Push AMD64 image') {
+          steps {
             script {
-              VERSION = INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh(returnStdout: true, script: 'cat VERSION')
+              INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './push-image.sh amd64'
             }
-            scanAndReport(INFRAPOOL_EXECUTORV2ARM_AGENT_0, "debify:${VERSION}", "HIGH", false)
           }
         }
-        stage('Scan Docker image for all issues (ARM64 based)') {
-          steps{
+
+        stage('Push ARM64 image') {
+          steps {
             script {
-              VERSION = INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh(returnStdout: true, script: 'cat VERSION')
+              INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './push-image.sh arm64'
             }
-            scanAndReport(INFRAPOOL_EXECUTORV2ARM_AGENT_0, "debify:${VERSION}", "NONE", true)
           }
         }
       }
     }
 
-    stage('Run feature tests') {
+    stage('Push Docker manifest with multi-arch') {
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './test.sh'
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'test-results', includes: 'features/reports/*.xml'
+          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './push-manifest.sh'
         }
       }
-      post { always {
-        unstash 'test-results'
-        junit 'features/reports/*.xml'
-      }}
     }
-
-    stage('Push Docker image') {
+    stage('Scan Docker image') {
       parallel {
-        stage('Push AMD64 image') {
-          steps {
+        stage('Scan Docker image (AMD64 based)') {
+          steps{
             script {
-              INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './push-image.sh amd64'
+              // Take the first value of the image-tags output
+              VERSION = INFRAPOOL_EXECUTORV2_AGENT_0.agentSh(returnStdout: true, script: './image-tags | cut -d" " -f1')
             }
+            runSecurityScans(INFRAPOOL_EXECUTORV2_AGENT_0,
+              image: "registry.tld/conjurinc/debify:${VERSION}",
+              buildMode: MODE,
+              branch: env.BRANCH_NAME,
+              arch: "linux/amd64"
+            )
           }
         }
-
-        stage('Push ARM64 image') {
-          steps {
+        stage('Scan Docker image (ARM64 based)') {
+          steps{
             script {
-              INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh './push-image.sh arm64'
+              // Take the first value of the image-tags output
+              VERSION = INFRAPOOL_EXECUTORV2ARM_AGENT_0.agentSh(returnStdout: true, script: './image-tags | cut -d" " -f1')
             }
+            runSecurityScans(INFRAPOOL_EXECUTORV2ARM_AGENT_0,
+              image: "registry.tld/conjurinc/debify:${VERSION}",
+              buildMode: MODE,
+              branch: env.BRANCH_NAME,
+              arch: "linux/arm64"
+            )
           }
         }
       }
     }
 
-    stage('Push Docker manifest with multi-arch') {
+    stage('Run feature tests') {
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './push-manifest.sh'
+          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './test.sh'
+          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'test-results', includes: 'features/reports/*.xml'
         }
       }
+      post { always {
+        unstash 'test-results'
+        junit 'features/reports/*.xml'
+      }}
     }
 
     stage('Release') {
@@ -216,4 +247,4 @@ pipeline {
       releaseInfraPoolAgent()
     }
   }
-}
+}

data/VERSION

@@ -1 +1 @@
-3.0.3-145
+3.0.3-216

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-debify
 version: !ruby/object:Gem::Version
-  version: 3.0.3.pre.145
+  version: 3.0.3.pre.216
 platform: ruby
 authors:
 - CyberArk Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-07-17 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli