From 735a5c5fdbe7636e8666b98d8c71d1b3fbdbf860 Mon Sep 17 00:00:00 2001
From: "R. Tyler Croy" <tyler@monkeypox.org>
Date: Wed, 3 Jan 2018 20:54:19 -0800
Subject: [PATCH] Rely on system configured environment variables

---
 example/Jenkinsfile          | 6 ------
 vars/archiveArtifacts.groovy | 8 +++++++-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/example/Jenkinsfile b/example/Jenkinsfile
index a7208d7..5bc1880 100644
--- a/example/Jenkinsfile
+++ b/example/Jenkinsfile
@@ -1,12 +1,6 @@
 pipeline {
     agent { dockerfile { dir 'example' } }
 
-    environment {
-        AZURE_STORAGE_ACCOUNT = 'codevaletartifacts'
-        AZURE_CONTAINER_NAME  = 'jenkins'
-        AZURE_ACCESS_KEY      = credentials('azure-access-key')
-    }
-
     stages {
         stage('Test') {
             steps {
diff --git a/vars/archiveArtifacts.groovy b/vars/archiveArtifacts.groovy
index 3a1ae1e..b9600ff 100644
--- a/vars/archiveArtifacts.groovy
+++ b/vars/archiveArtifacts.groovy
@@ -16,8 +16,14 @@ def call(Map args) {
     String uploadScriptName = '__azure-upload.sh'
     String uploadScript = libraryResource 'io/codevalet/externalartifacts/upload-file-azure.sh'
     writeFile file: uploadScriptName, text: uploadScript
-    String uploadedUrl = sh(script: "bash ${uploadScriptName} ${args.artifacts}",
+
+    String uploadedUrl
+    withCredentials([string(credentialsId: 'azure-access-key',
+        variable: 'AZURE_ACCESS_KEY')]) {
+
+        uploadedUrl = sh(script: "bash ${uploadScriptName} ${args.artifacts}",
                             returnStdout: true).trim()
+    }
 
     if (uploadedUrl =~ /https\:\/\//) {
         /* if the output was a URL, generate our redirect file */