From 87922b9c52e250932a2bc23e977870b6592be60a Mon Sep 17 00:00:00 2001
From: Minreaux <9372700+Minreaux@users.noreply.github.com>
Date: Wed, 13 Dec 2023 01:08:40 -0800
Subject: [PATCH] Add support for Azure CDN endpoint URL (#280)

Co-authored-by: Tim Jacomb <21194782+timja@users.noreply.github.com>
Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
---
 .gitignore                                    |  1 +
 pom.xml                                       | 32 +++++------
 .../AzureStorageBuilder.java                  |  1 +
 .../WAStoragePublisher.java                   |  9 ++-
 .../beans/StorageAccountInfo.java             | 18 +++++-
 .../helper/AzureCredentialsBinding.java       | 19 +++++++
 .../helper/AzureStorageAccount.java           | 38 +++++++++----
 .../helper/AzureUtils.java                    | 13 +++++
 .../helper/CredentialMigration.java           |  6 +-
 .../config-variables.jelly                    |  3 +
 .../config-variables.properties               |  1 +
 .../AzureStorageAccount/credentials.jelly     | 11 +++-
 src/main/resources/global.properties          |  1 +
 src/main/webapp/help-cdnEndPointURL.html      | 11 ++++
 .../IntegrationTests/IntegrationTest.java     | 16 ++++--
 .../WAStorageClientUploadIT.java              |  6 +-
 .../windowsazurestorage/ConfigAsCodeTest.java | 55 +++++++++++++++++--
 .../beans/StorageAccountInfoTest.java         | 34 ++++++++++--
 .../helper/AzureStorageAccountTest.java       | 34 ++++++++----
 .../helper/CredentialMigrationTest.java       |  8 +--
 .../helper/CredentialRenameTest.java          |  6 +-
 .../configuration-as-code.yml                 | 10 +++-
 .../testRenameStorageConfig/credentials.xml   |  3 +-
 23 files changed, 260 insertions(+), 76 deletions(-)
 create mode 100644 src/main/webapp/help-cdnEndPointURL.html

diff --git a/.gitignore b/.gitignore
index e98bd4e6..0989fad5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ index.html
 *.dylib
 .env
 testshare*
+.vscode/
diff --git a/pom.xml b/pom.xml
index 0e6b9734..e383e8ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,13 +10,12 @@
     <version>${changelist}</version>
     <packaging>hpi</packaging>
     <name>Azure Storage plugin</name>
-    <description>Uploads build artifacts or downloads build dependencies using Azure storage</description>
     <url>https://github.com/jenkinsci/azure-storage-plugin</url>
 
     <properties>
         <changelist>9999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/azure-storage-plugin</gitHubRepo>
-        <jenkins.version>2.361.4</jenkins.version>
+        <jenkins.version>2.387.3</jenkins.version>
     </properties>
 
     <licenses>
@@ -26,6 +25,18 @@
         </license>
     </licenses>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.jenkins.tools.bom</groupId>
+                <artifactId>bom-2.387.x</artifactId>
+                <version>2543.vfb_1a_5fb_9496d</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>io.jenkins.plugins</groupId>
@@ -35,7 +46,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>copyartifact</artifactId>
-            <version>1.46</version>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
@@ -82,7 +92,6 @@
         <dependency>
             <groupId>io.jenkins.blueocean</groupId>
             <artifactId>blueocean-rest</artifactId>
-            <version>1.24.6</version>
         </dependency>
 
         <dependency>
@@ -97,21 +106,9 @@
         </dependency>
     </dependencies>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.277.x</artifactId>
-                <version>984.vb5eaac999a7e</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <scm>
         <connection>scm:git:ssh://github.com/${gitHubRepo}.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/${gitHubRepo}.git</developerConnection>
+        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
         <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
@@ -164,7 +161,6 @@
                 </executions>
                 <configuration>
                     <configLocation>checkstyle.xml</configLocation>
-                    <encoding>UTF-8</encoding>
                     <consoleOutput>true</consoleOutput>
                     <!--
                     Exclude the generated sources.
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java
index 3b80e85a..f20761d4 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/AzureStorageBuilder.java
@@ -354,6 +354,7 @@ private void validateData(Run<?, ?> run,
             listener.getLogger().println(Messages.Client_SA_val_fail());
             listener.getLogger().println(storageAccountInfo.getStorageAccName());
             listener.getLogger().println(storageAccountInfo.getBlobEndPointURL());
+            listener.getLogger().println(storageAccountInfo.getCdnEndPointURL());
             run.setResult(Result.UNSTABLE);
         }
     }
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java
index ceb717df..bc11d48d 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/WAStoragePublisher.java
@@ -635,6 +635,7 @@ public boolean configure(StaplerRequest req, JSONObject formData)
          * @param was_storageAccName
          * @param was_storageAccountKey
          * @param was_blobEndPointURL
+         * @param was_cdnEndPointURL
          * @return
          * @throws IOException
          * @throws ServletException
@@ -643,7 +644,8 @@ public FormValidation doCheckAccount(
                 //CHECKSTYLE:OFF
                 @QueryParameter String was_storageAccName,
                 @QueryParameter String was_storageAccountKey,
-                @QueryParameter String was_blobEndPointURL) throws IOException, ServletException {
+                @QueryParameter String was_blobEndPointURL,
+                @QueryParameter String was_cdnEndPointURL) throws IOException, ServletException {
             //CHECKSTYLE:ON
 
             if (StringUtils.isBlank(was_storageAccName)) {
@@ -657,11 +659,12 @@ public FormValidation doCheckAccount(
             }
 
             String blobEndPointURL = was_blobEndPointURL;
+            String cdnEndPointURL = was_cdnEndPointURL;
             try {
-                // Get formatted blob end point URL.
+                // Get formatted blob endpoint URL.
                 blobEndPointURL = Utils.getBlobEP(blobEndPointURL);
                 StorageAccountInfo storageAccount = new StorageAccountInfo(
-                        was_storageAccName, was_storageAccountKey, blobEndPointURL);
+                        was_storageAccName, was_storageAccountKey, blobEndPointURL, cdnEndPointURL);
                 AzureUtils.validateStorageAccount(storageAccount, false);
             } catch (Exception e) {
                 return FormValidation.error(e, "Error : " + e.getMessage());
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfo.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfo.java
index a92d9ca3..50e4c695 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfo.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfo.java
@@ -30,16 +30,22 @@ public class StorageAccountInfo {
     private String storageAccountKey;
 
     /**
-     * Azure stoarge blob end point url.
+     * Azure storage blob endpoint URL.
      */
     private String blobEndPointURL;
 
+    /**
+     * Azure storage CDN endpoint URL.
+     */
+    private String cdnEndPointURL;
+
     @DataBoundConstructor
     public StorageAccountInfo(String storageAccName, String storageAccountKey,
-                              String blobEndPointURL) {
+                              String blobEndPointURL, String cdnEndPointURL) {
         this.storageAccName = storageAccName;
         this.blobEndPointURL = blobEndPointURL;
         this.storageAccountKey = storageAccountKey;
+        this.cdnEndPointURL = cdnEndPointURL;
     }
 
     public String getStorageAccName() {
@@ -65,4 +71,12 @@ public String getBlobEndPointURL() {
     public void setBlobEndPointURL(String blobEndPointURL) {
         this.blobEndPointURL = blobEndPointURL;
     }
+
+    public String getCdnEndPointURL() {
+        return cdnEndPointURL;
+    }
+
+    public void setCdnEndPointURL(String cdnEndPointURL) {
+        this.cdnEndPointURL = cdnEndPointURL;
+    }
 }
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
index 532f41b4..023f76fa 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding.java
@@ -26,10 +26,12 @@ public class AzureCredentialsBinding extends MultiBinding<AzureStorageAccount> {
     public static final String DEFAULT_STORAGE_ACCOUNT_NAME = "AZURE_STORAGE_ACCOUNT_NAME";
     public static final String DEFAULT_STORAGE_ACCOUNT_KEY = "AZURE_STORAGE_ACCOUNT_KEY";
     public static final String DEFAULT_BLOB_ENDPOINT_URL = "AZURE_BLOB_ENDPOINT_URL";
+    public static final String DEFAULT_CDN_ENDPOINT_URL = "AZURE_CDN_ENDPOINT_URL";
 
     private String storageAccountNameVariable;
     private String storageAccountKeyVariable;
     private String blobEndpointUrlVariable;
+    private String cdnEndpointUrlVariable;
 
     @DataBoundConstructor
     public AzureCredentialsBinding(String credentialsId) {
@@ -51,6 +53,11 @@ public void setBlobEndpointUrlVariable(String blobEndpointUrlVariable) {
         this.blobEndpointUrlVariable = blobEndpointUrlVariable;
     }
 
+    @DataBoundSetter
+    public void setCdnEndpointUrlVariable(String cdnEndpointUrlVariable) {
+        this.cdnEndpointUrlVariable = cdnEndpointUrlVariable;
+    }
+
     public String getStorageAccountNameVariable() {
         if (!StringUtils.isBlank(storageAccountNameVariable)) {
             return storageAccountNameVariable;
@@ -72,6 +79,13 @@ public String getBlobEndpointUrlVariable() {
         return DEFAULT_BLOB_ENDPOINT_URL;
     }
 
+    public String getCdnEndpointUrlVariable() {
+        if (!StringUtils.isBlank(cdnEndpointUrlVariable)) {
+            return cdnEndpointUrlVariable;
+        }
+        return DEFAULT_CDN_ENDPOINT_URL;
+    }
+
     @Override
     protected Class<AzureStorageAccount> type() {
         return AzureStorageAccount.class;
@@ -88,6 +102,7 @@ public MultiEnvironment bind(@NonNull Run<?, ?> build,
         variableMap.put(getStorageAccountNameVariable(), credentials.getStorageAccountName());
         variableMap.put(getStorageAccountKeyVariable(), credentials.getPlainStorageKey());
         variableMap.put(getBlobEndpointUrlVariable(), credentials.getBlobEndpointURL());
+        variableMap.put(getCdnEndpointUrlVariable(), credentials.getCdnEndpointURL());
         return new MultiEnvironment(variableMap);
     }
 
@@ -129,5 +144,9 @@ public static String getDefaultStorageAccountKeyVariable() {
         public static String getDefaultBlobEndpointUrlVariable() {
             return DEFAULT_BLOB_ENDPOINT_URL;
         }
+
+        public static String getDefaultCdnEndpointUrlVariable() {
+            return DEFAULT_CDN_ENDPOINT_URL;
+        }
     }
 }
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount.java
index 192aad3a..9c5da1d2 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount.java
@@ -50,18 +50,25 @@ public static class StorageAccountCredential implements java.io.Serializable {
         private final String storageAccountName;
         private final Secret storageAccountKey;
         private final String blobEndpointURL;
+        private final String cdnEndpointURL;
 
         public StorageAccountCredential(
                 String storageAccountName,
                 String storageKey,
-                String endpointURL) {
+                String blobEndpointURL,
+                String cdnEndpointURL) {
             this.storageAccountName = storageAccountName;
             this.storageAccountKey = Secret.fromString(storageKey);
-            String url = endpointURL;
-            if (StringUtils.isBlank(endpointURL)) {
+            String url = blobEndpointURL;
+            if (StringUtils.isBlank(blobEndpointURL)) {
                 url = Constants.DEF_BLOB_URL;
             }
             this.blobEndpointURL = joinAccountNameAndEndpoint(storageAccountName, url);
+            if (StringUtils.isBlank(cdnEndpointURL)) {
+                this.cdnEndpointURL = "";
+            } else {
+                this.cdnEndpointURL = cdnEndpointURL;
+            }
         }
 
         /**
@@ -85,6 +92,7 @@ public StorageAccountCredential() {
             this.storageAccountName = "";
             this.storageAccountKey = Secret.fromString("");
             this.blobEndpointURL = Constants.DEF_BLOB_URL;
+            this.cdnEndpointURL = "";
         }
 
         public boolean isValidStorageCredential() throws WAStorageException {
@@ -115,11 +123,15 @@ protected Secret getSecureKey() {
             return storageAccountKey;
         }
 
-        public String getEndpointURL() {
+        public String getBlobEndpointURL() {
             // joined in getter as constructor isn't called when reading saved configuration
             return joinAccountNameAndEndpoint(storageAccountName, blobEndpointURL);
         }
 
+        public String getCdnEndpointURL() {
+            return cdnEndpointURL;
+        }
+
         public String getId() {
             String storageId = this.getStorageAccountName().concat(this.getStorageAccountKey());
             return Utils.getMD5(storageId);
@@ -136,10 +148,11 @@ public AzureStorageAccount(
             String description,
             String storageAccountName,
             String storageKey,
-            String blobEndpointURL
+            String blobEndpointURL,
+            String cdnEndpointURL
     ) {
         super(scope, id, description);
-        storageData = new StorageAccountCredential(storageAccountName, storageKey, blobEndpointURL);
+        storageData = new StorageAccountCredential(storageAccountName, storageKey, blobEndpointURL, cdnEndpointURL);
     }
 
     public static AzureStorageAccount.StorageAccountCredential getStorageAccountCredential(Item owner,
@@ -213,7 +226,11 @@ public String getStorageKey() {
     }
 
     public String getBlobEndpointURL() {
-        return storageData.getEndpointURL();
+        return storageData.getBlobEndpointURL();
+    }
+
+    public String getCdnEndpointURL() {
+        return storageData.getCdnEndpointURL();
     }
 
     public StorageAccountCredential getStorageCred() {
@@ -235,11 +252,12 @@ public String getDefaultBlobURL() {
         public FormValidation doVerifyConfiguration(
                 @QueryParameter String storageAccountName,
                 @QueryParameter Secret storageKey,
-                @QueryParameter String blobEndpointURL) {
+                @QueryParameter String blobEndpointURL,
+                @QueryParameter String cdnEndpointURL) {
 
             try {
                 StorageAccountInfo storageAccount = new StorageAccountInfo(
-                        storageAccountName, storageKey.getPlainText(), blobEndpointURL);
+                        storageAccountName, storageKey.getPlainText(), blobEndpointURL, cdnEndpointURL);
                 AzureUtils.validateStorageAccount(storageAccount, false);
             } catch (Exception e) {
                 return FormValidation.error(e, e.getMessage());
@@ -252,7 +270,7 @@ public FormValidation doVerifyConfiguration(
 
     public static StorageAccountInfo convertToStorageAccountInfo(StorageAccountCredential storageCreds) {
         return new StorageAccountInfo(storageCreds.getStorageAccountName(), storageCreds.getStorageAccountKey(),
-                storageCreds.getEndpointURL());
+                storageCreds.getBlobEndpointURL(), storageCreds.getCdnEndpointURL());
     }
 
 }
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
index 15db07c0..cc5ee816 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureUtils.java
@@ -40,12 +40,16 @@
 import io.jenkins.plugins.azuresdk.HttpClientRetriever;
 
 import java.io.IOException;
+import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
+import java.net.URL;
 import java.time.Duration;
 import java.time.OffsetDateTime;
 import java.util.Collections;
 
+import org.apache.commons.lang.StringUtils;
+
 public final class AzureUtils {
     private static final String TEST_CNT_NAME = "testcheckfromjenkins";
     private static final String BLOB = "blob";
@@ -70,9 +74,18 @@ public static boolean validateStorageAccount(
                     storageAccount, TEST_CNT_NAME, false, allowRetry, null);
             container.exists();
 
+            // Check if the CDN endpoint exists
+            if (!StringUtils.isBlank(storageAccount.getCdnEndPointURL())) {
+                URL cdnEndpointURL = new URL(storageAccount.getCdnEndPointURL());
+                HttpURLConnection huc = (HttpURLConnection) cdnEndpointURL.openConnection();
+                huc.setRequestMethod("HEAD");
+
+                huc.getResponseCode(); // Throws exception if no response received
+            }
         } catch (Exception e) {
             throw new WAStorageException(Messages.Client_SA_val_fail(), e);
         }
+
         return true;
     }
 
diff --git a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigration.java b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigration.java
index 421ed0c7..9ff7c6a7 100644
--- a/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigration.java
+++ b/src/main/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigration.java
@@ -68,7 +68,7 @@ protected static List<StorageAccountInfo> getOldStorageConfig(
                 String blobURL = elem.getElementsByTagName("blobEndPointURL").item(0)
                         .getChildNodes().item(0).getNodeValue();
 
-                storages.add(new StorageAccountInfo(accName, accKey, blobURL));
+                storages.add(new StorageAccountInfo(accName, accKey, blobURL, ""));
             }
         }
 
@@ -119,7 +119,7 @@ public static void upgradeStorageConfig() throws Exception {
 
                 AzureStorageAccount.StorageAccountCredential u =
                         new AzureStorageAccount.StorageAccountCredential(
-                                storageAccount, storageAccountKey, storageBlobURL);
+                                storageAccount, storageAccountKey, storageBlobURL, "");
                 AzureStorageAccount cred = CredentialsMatchers.firstOrNull(
                         CredentialsProvider.lookupCredentials(
                                 AzureStorageAccount.class,
@@ -142,7 +142,7 @@ public static void upgradeStorageConfig() throws Exception {
                         "credential for " + storageAccount,
                         storageAccount,
                         storageAccountKey,
-                        storageBlobURL);
+                        storageBlobURL, "");
                 final SecurityContext securityContext = ACL.impersonate(ACL.SYSTEM);
 
                 try {
diff --git a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.jelly b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.jelly
index c7d694a8..c8bddd32 100644
--- a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.jelly
+++ b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.jelly
@@ -14,4 +14,7 @@
     <f:entry title="${%BlobEndpointUrlVariable}" field="blobEndpointUrlVariable" help="/plugin/windows-azure-storage/help-blobEndPointURL.html">
         <f:textbox default="${descriptor.getDefaultBlobEndpointUrlVariable()}"/>
     </f:entry>
+    <f:entry title="${%CdnEndpointUrlVariable}" field="cdnEndpointUrlVariable" help="/plugin/windows-azure-storage/help-cdnEndPointURL.html">
+        <f:textbox default="${descriptor.getDefaultBlobEndpointUrlVariable()}"/>
+    </f:entry>
 </j:jelly>
diff --git a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.properties b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.properties
index c98bba56..95628f48 100644
--- a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.properties
+++ b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureCredentialsBinding/config-variables.properties
@@ -4,3 +4,4 @@
 StorageAccountNameVariable=Storage Account Name Variable
 StorageAccountKeyVariable=Storage Account Key Variable
 BlobEndpointUrlVariable=Blob Endpoint Url Variable
+CdnEndpointUrlVariable=Cdn Endpoint Url Variable
diff --git a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount/credentials.jelly b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount/credentials.jelly
index ac797cc7..c45578b1 100644
--- a/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount/credentials.jelly
+++ b/src/main/resources/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccount/credentials.jelly
@@ -12,6 +12,13 @@
       <f:textbox default="${descriptor.getDefaultBlobURL()}" />
     </f:entry>
     <st:include page="id-and-description" class="${descriptor.clazz}"/>
+    <f:section>
+      <f:advanced>
+        <f:entry title="${%CDN EndPoint URL}" field="cdnEndpointURL" help="/plugin/windows-azure-storage/help-cdnEndPointURL.html">
+          <f:textbox />
+        </f:entry>
+      </f:advanced>
+    </f:section>
     <f:validateButton title="${%Verify Configuration}" progress="${%Verifying}" method="verifyConfiguration"
-          with="storageAccountName,storageKey,blobEndpointURL" />
-</j:jelly>
\ No newline at end of file
+          with="storageAccountName,storageKey,blobEndpointURL,cdnEndpointURL" />
+</j:jelly>
diff --git a/src/main/resources/global.properties b/src/main/resources/global.properties
index c533bf21..1707cbb1 100644
--- a/src/main/resources/global.properties
+++ b/src/main/resources/global.properties
@@ -3,6 +3,7 @@ entry_title=Storage Account Details
 rep_storageAccountName=Storage account name
 rep_storageAccountKey=Storage account key
 rep_blobEndPointURL=Blob service endpoint URL
+rep_cdnEndPointURL=CDN service endpoint URL
 rep_val_btn=Validate storage credentials
 rep_val_btn_msg=Validation in progress...
 rep_del_btn=Delete
diff --git a/src/main/webapp/help-cdnEndPointURL.html b/src/main/webapp/help-cdnEndPointURL.html
new file mode 100644
index 00000000..434a7d12
--- /dev/null
+++ b/src/main/webapp/help-cdnEndPointURL.html
@@ -0,0 +1,11 @@
+<div>
+    <p>
+        The endpoint URL for a Content Delivery Network (CDN) backing your Azure storage account.
+        This is used with the <a href="https://plugins.jenkins.io/azure-artifact-manager/">Azure Artifact Manager</a> plugin.
+        Leave this blank if you are not using a CDN for this Azure storage account.
+    </p>
+
+    <p>
+        A CDN URL normally looks like: <code>https://cdn-resource-name.azureedge.net</code>
+    </p>
+</div>
diff --git a/src/test/java/IntegrationTests/IntegrationTest.java b/src/test/java/IntegrationTests/IntegrationTest.java
index e723c534..fb56030b 100644
--- a/src/test/java/IntegrationTests/IntegrationTest.java
+++ b/src/test/java/IntegrationTests/IntegrationTest.java
@@ -23,15 +23,16 @@
 To execute the integration tests you need to set the credentials env variables (the ones that don't have a default) and run mvn failsafe:integration-test
 */
 public class IntegrationTest {
-    @ClassRule 
+    @ClassRule
     public static JenkinsRule j = new JenkinsRule();
-    
+
     protected static class TestEnvironment {
         public final String azureStorageAccountName;
         public final String azureStorageAccountKey1;
         public final String azureStorageAccountKey2;
-        
+
         public final String blobURL;
+        public final String cdnURL;
         public final StorageAccountInfo sampleStorageAccount;
         public static final int TOTAL_FILES = 50;
         public HashMap<String, File> downloadFileList = new HashMap<>();
@@ -47,17 +48,20 @@ protected static class TestEnvironment {
             azureStorageAccountName = TestEnvironment.loadFromEnv("AZURE_STORAGE_TEST_STORAGE_ACCOUNT_NAME");
             azureStorageAccountKey1 = TestEnvironment.loadFromEnv("AZURE_STORAGE_TEST_STORAGE_ACCOUNT_KEY1");
             azureStorageAccountKey2 = TestEnvironment.loadFromEnv("AZURE_STORAGE_TEST_STORAGE_ACCOUNT_KEY2");
-            
+
             blobURL = Utils.DEF_BLOB_URL.replace("https://",
                     String.format("https://%s.", azureStorageAccountName));
-            AzureStorageAccount.StorageAccountCredential u = new AzureStorageAccount.StorageAccountCredential(azureStorageAccountName, azureStorageAccountKey1, blobURL);
-            sampleStorageAccount = new StorageAccountInfo(azureStorageAccountName,azureStorageAccountKey1, blobURL);
+            cdnURL = "";
+            AzureStorageAccount.StorageAccountCredential u = new AzureStorageAccount.StorageAccountCredential(azureStorageAccountName, azureStorageAccountKey1, blobURL, cdnURL);
+            sampleStorageAccount = new StorageAccountInfo(azureStorageAccountName,azureStorageAccountKey1, blobURL, cdnURL);
             containerName = name;
             shareName = name;
         }
+
         private static String loadFromEnv(final String name) {
             return TestEnvironment.loadFromEnv(name, "");
         }
+
         private static String loadFromEnv(final String name, final String defaultValue) {
             final String value = System.getenv(name);
             if (value == null || value.isEmpty()) {
diff --git a/src/test/java/IntegrationTests/WAStorageClientUploadIT.java b/src/test/java/IntegrationTests/WAStorageClientUploadIT.java
index 299f23dc..934a82b4 100644
--- a/src/test/java/IntegrationTests/WAStorageClientUploadIT.java
+++ b/src/test/java/IntegrationTests/WAStorageClientUploadIT.java
@@ -99,7 +99,7 @@ public void testValidateStorageAccount() throws Exception {
     @Test(expected = WAStorageException.class)
     public void testInvalidateStorageAccount1() throws Exception {
         System.out.println("Testing Invalid StorageAccount");
-        AzureUtils.validateStorageAccount(new StorageAccountInfo(testEnv.azureStorageAccountName, "asdhasdh@asdas!@234=", testEnv.blobURL), false);
+        AzureUtils.validateStorageAccount(new StorageAccountInfo(testEnv.azureStorageAccountName, "asdhasdh@asdas!@234=", testEnv.blobURL, testEnv.cdnURL), false);
         if (testEnv.container.exists()) {
             testEnv.container.delete();
         }
@@ -111,7 +111,7 @@ public void testInvalidateStorageAccount1() throws Exception {
     @Test(expected = WAStorageException.class)
     public void testInvalidateStorageAccount2() throws Exception {
         System.out.println("Testing Invalid StorageAccount");
-        AzureUtils.validateStorageAccount(new StorageAccountInfo("rfguthio123", testEnv.azureStorageAccountKey2, testEnv.blobURL), false);
+        AzureUtils.validateStorageAccount(new StorageAccountInfo("rfguthio123", testEnv.azureStorageAccountKey2, testEnv.blobURL, testEnv.cdnURL), false);
         if (testEnv.container.exists()) {
             testEnv.container.delete();
         }
@@ -123,7 +123,7 @@ public void testInvalidateStorageAccount2() throws Exception {
     @Test(expected = WAStorageException.class)
     public void testInvalidateStorageAccount3() throws Exception {
         System.out.println("Testing Invalid StorageAccount");
-        AzureUtils.validateStorageAccount(new StorageAccountInfo(null, null, null), false);
+        AzureUtils.validateStorageAccount(new StorageAccountInfo(null, null, null, null), false);
         if (testEnv.container.exists()) {
             testEnv.container.delete();
         }
diff --git a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/ConfigAsCodeTest.java b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/ConfigAsCodeTest.java
index cc02fd22..1e3045f4 100644
--- a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/ConfigAsCodeTest.java
+++ b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/ConfigAsCodeTest.java
@@ -11,7 +11,7 @@
 import io.jenkins.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
 import io.jenkins.plugins.casc.model.CNode;
 import io.jenkins.plugins.casc.model.Mapping;
-import org.junit.Rule;
+import org.junit.ClassRule;
 import org.junit.Test;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -20,11 +20,11 @@
 
 public class ConfigAsCodeTest {
 
-    @Rule
-    public JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule();
+    @ClassRule
+    @ConfiguredWithCode("configuration-as-code.yml")
+    public static JenkinsConfiguredWithCodeRule j = new JenkinsConfiguredWithCodeRule();
 
     @Test
-    @ConfiguredWithCode("configuration-as-code.yml")
     public void should_support_configuration_as_code() {
         AzureStorageAccount credentials = (AzureStorageAccount) SystemCredentialsProvider.getInstance().getCredentials()
                 .get(0);
@@ -38,7 +38,20 @@ public void should_support_configuration_as_code() {
     }
 
     @Test
-    @ConfiguredWithCode("configuration-as-code.yml")
+    public void should_support_configuration_as_code_with_cdn() {
+        AzureStorageAccount credentials = (AzureStorageAccount) SystemCredentialsProvider.getInstance().getCredentials()
+                .get(1);
+
+        assertThat(credentials.getScope(), is(CredentialsScope.GLOBAL));
+        assertThat(credentials.getDescription(), is("CDN Enabled Account"));
+        assertThat(credentials.getStorageAccountName(), is("b-storage-account"));
+        assertThat(credentials.getBlobEndpointURL(), is("https://b-storage-account.blob.core.windows.net/"));
+        assertThat(credentials.getCdnEndpointURL(), is("https://cdn-resource-name.azureedge.net/"));
+        assertThat(credentials.getId(), is("cdn-enabled-storage-account"));
+        assertNotNull(credentials.getStorageKey());
+    }
+
+    @Test
     public void export_configuration() throws Exception {
         ConfiguratorRegistry registry = ConfiguratorRegistry.get();
         ConfigurationContext context = new ConfigurationContext(registry);
@@ -68,4 +81,36 @@ public void export_configuration() throws Exception {
         assertThat(mapping.getScalarValue("id"), is("storage-account"));
         assertNotNull(mapping.getScalarValue("storageKey"));
     }
+
+    @Test
+    public void export_configuration_with_cdn() throws Exception {
+        ConfiguratorRegistry registry = ConfiguratorRegistry.get();
+        ConfigurationContext context = new ConfigurationContext(registry);
+
+        CredentialsRootConfigurator root = ExtensionList
+                .lookupSingleton(CredentialsRootConfigurator.class);
+        final CNode node = root.describe(root.getTargetComponent(context), context);
+
+        assertNotNull(node);
+        Mapping mapping = node.asMapping().get("system")
+                .asMapping()
+                .get("domainCredentials")
+                .asSequence()
+                .get(0)
+                .asMapping()
+                .get("credentials")
+                .asSequence()
+                .get(1)
+                .asMapping()
+                .get("azureStorageAccount")
+                .asMapping();
+
+        assertThat(mapping.getScalarValue("scope"), is("GLOBAL"));
+        assertThat(mapping.getScalarValue("description"), is("CDN Enabled Account"));
+        assertThat(mapping.getScalarValue("storageAccountName"), is("b-storage-account"));
+        assertThat(mapping.getScalarValue("blobEndpointURL"), is("https://b-storage-account.blob.core.windows.net/"));
+        assertThat(mapping.getScalarValue("cdnEndpointURL"), is("https://cdn-resource-name.azureedge.net/"));
+        assertThat(mapping.getScalarValue("id"), is("cdn-enabled-storage-account"));
+        assertNotNull(mapping.getScalarValue("storageKey"));
+    }
 }
diff --git a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfoTest.java b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfoTest.java
index cc0ceda3..e4a7cd48 100644
--- a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfoTest.java
+++ b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/beans/StorageAccountInfoTest.java
@@ -18,11 +18,12 @@ public class StorageAccountInfoTest {
     private StorageAccountInfo st;
     private String stName = "test1";
     private String stKey = "123";
-    private String stURL = "http://test1";
-    
+    private String stBlobURL = "http://test1";
+    private String stCdnURL = "http://cdn-test1";
+
     @Before
     public void setUp() {
-        st = new StorageAccountInfo(stName, stKey, stURL);
+        st = new StorageAccountInfo(stName, stKey, stBlobURL, stCdnURL);
     }
 
     /**
@@ -77,7 +78,7 @@ public void testSetStorageAccountKey() {
     public void testGetBlobEndPointURL() {
         System.out.println("getBlobEndPointURL");
         StorageAccountInfo instance = st;
-        assertEquals(stURL, instance.getBlobEndPointURL());
+        assertEquals(stBlobURL, instance.getBlobEndPointURL());
     }
 
     /**
@@ -87,9 +88,30 @@ public void testGetBlobEndPointURL() {
     public void testSetBlobEndPointURL() {
         System.out.println("setBlobEndPointURL");
         StorageAccountInfo instance = st;
-        assertEquals(stURL, instance.getBlobEndPointURL());
+        assertEquals(stBlobURL, instance.getBlobEndPointURL());
         instance.setBlobEndPointURL("abcd");
         assertEquals("abcd", instance.getBlobEndPointURL());
     }
-    
+
+    /**
+     * Test of getCdnEndPointURL method, of class StorageAccountInfo.
+     */
+    @Test
+    public void testGetCdnEndPointURL() {
+        System.out.println("getCdnEndPointURL");
+        StorageAccountInfo instance = st;
+        assertEquals(stCdnURL, instance.getCdnEndPointURL());
+    }
+
+    /**
+     * Test of setCdnEndPointURL method, of class StorageAccountInfo.
+     */
+    @Test
+    public void testSetCdnEndPointURL() {
+        System.out.println("setCdnEndPointURL");
+        StorageAccountInfo instance = st;
+        assertEquals(stCdnURL, instance.getCdnEndPointURL());
+        instance.setCdnEndPointURL("cdn-123");
+        assertEquals("cdn-123", instance.getCdnEndPointURL());
+    }
 }
diff --git a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccountTest.java b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccountTest.java
index c85b1728..790a5a17 100644
--- a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccountTest.java
+++ b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/AzureStorageAccountTest.java
@@ -29,7 +29,8 @@
 public class AzureStorageAccountTest {
     private String stName = "test1";
     private String stKey = "123";
-    private String stURL = "http://test1";
+    private String stBlobURL = "http://test1";
+    private String stCdnURL = "http://cdn-test1";
 
     private AzureStorageAccount azureCred;
     private AzureStorageAccount.StorageAccountCredential stCred;
@@ -39,8 +40,8 @@ public class AzureStorageAccountTest {
 
     @Before
     public void setUp() throws IOException {
-        azureCred = new AzureStorageAccount(CredentialsScope.GLOBAL, UUID.randomUUID().toString(), null, stName, stKey, stURL);
-        stCred = new AzureStorageAccount.StorageAccountCredential(stName, stKey, stURL);
+        azureCred = new AzureStorageAccount(CredentialsScope.GLOBAL, UUID.randomUUID().toString(), null, stName, stKey, stBlobURL, stCdnURL);
+        stCred = new AzureStorageAccount.StorageAccountCredential(stName, stKey, stBlobURL, stCdnURL);
         CredentialsStore s = CredentialsProvider.lookupStores(Jenkins.getInstance()).iterator().next();
         s.addCredentials(Domain.global(), azureCred);
     }
@@ -59,7 +60,8 @@ public void testGetStorageAccountCredential() {
         assertEquals(stCred.getStorageAccountKey(), result.getStorageAccountKey());
         assertEquals(stCred.getSecureKey(), result.getSecureKey());
         assertEquals(stCred.getStorageAccountName(), result.getStorageAccountName());
-        assertEquals(stCred.getEndpointURL(), result.getEndpointURL());
+        assertEquals(stCred.getBlobEndpointURL(), result.getBlobEndpointURL());
+        assertEquals(stCred.getCdnEndpointURL(), result.getCdnEndpointURL());
     }
 
     /**
@@ -71,12 +73,14 @@ public void testGetStorageCreds() {
         AzureStorageAccount.StorageAccountCredential result = AzureStorageAccount.getStorageCreds(azureCred.getId(), stName);
         assertEquals(stCred.getStorageAccountKey(), result.getStorageAccountKey());
         assertEquals(stCred.getStorageAccountName(), result.getStorageAccountName());
-        assertEquals(stCred.getEndpointURL(), result.getEndpointURL());
+        assertEquals(stCred.getBlobEndpointURL(), result.getBlobEndpointURL());
+        assertEquals(stCred.getCdnEndpointURL(), result.getCdnEndpointURL());
 
         result = AzureStorageAccount.getStorageCreds(null, stName);
         assertEquals(stCred.getStorageAccountKey(), result.getStorageAccountKey());
         assertEquals(stCred.getStorageAccountName(), result.getStorageAccountName());
-        assertEquals(stCred.getEndpointURL(), result.getEndpointURL());
+        assertEquals(stCred.getBlobEndpointURL(), result.getBlobEndpointURL());
+        assertEquals(stCred.getCdnEndpointURL(), result.getCdnEndpointURL());
     }
 
     /**
@@ -103,7 +107,16 @@ public void testGetStorageKey() {
     @Test
     public void testGetBlobEndpointURL() {
         System.out.println("getBlobEndpointURL");
-        assertEquals(stURL, azureCred.getBlobEndpointURL());
+        assertEquals(stBlobURL, azureCred.getBlobEndpointURL());
+    }
+
+    /**
+     * Test of getCdnEndpointURL method, of class AzureStorageAccount.
+     */
+    @Test
+    public void testGetCdnEndpointURL() {
+        System.out.println("getCdnEndpointURL");
+        assertEquals(stCdnURL, azureCred.getCdnEndpointURL());
     }
 
     /**
@@ -115,7 +128,8 @@ public void testGetStorageCred() {
         assertEquals(stCred.getStorageAccountKey(), azureCred.getStorageCred().getStorageAccountKey());
         assertEquals(stCred.getSecureKey(), azureCred.getStorageCred().getSecureKey());
         assertEquals(stCred.getStorageAccountName(), azureCred.getStorageCred().getStorageAccountName());
-        assertEquals(stCred.getEndpointURL(), azureCred.getStorageCred().getEndpointURL());
+        assertEquals(stCred.getBlobEndpointURL(), azureCred.getStorageCred().getBlobEndpointURL());
+        assertEquals(stCred.getCdnEndpointURL(), azureCred.getStorageCred().getCdnEndpointURL());
     }
 
     /**
@@ -124,11 +138,11 @@ public void testGetStorageCred() {
     @Test
     public void testConvertToStorageAccountInfo() {
         System.out.println("convertToStorageAccountInfo");
-        StorageAccountInfo expResult = new StorageAccountInfo(stName, stKey, stURL);
+        StorageAccountInfo expResult = new StorageAccountInfo(stName, stKey, stBlobURL, stCdnURL);
         StorageAccountInfo result = AzureStorageAccount.convertToStorageAccountInfo(azureCred.getStorageCred());
         assertEquals(expResult.getStorageAccName(), result.getStorageAccName());
         assertEquals(expResult.getBlobEndPointURL(), result.getBlobEndPointURL());
+        assertEquals(expResult.getCdnEndPointURL(), result.getCdnEndPointURL());
         assertEquals(expResult.getStorageAccountKey(), result.getStorageAccountKey());
     }
-
 }
diff --git a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigrationTest.java b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigrationTest.java
index 9f9de24a..5cc5d908 100644
--- a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigrationTest.java
+++ b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialMigrationTest.java
@@ -92,12 +92,12 @@ public void testUpgradeStorageConfig() throws Exception {
 
         assertEquals(2, s.getCredentials(Domain.global()).size());
                 
-        AzureStorageAccount.StorageAccountCredential u = new AzureStorageAccount.StorageAccountCredential(storageAccount, storageAccountKey, storageBlobURL);
+        AzureStorageAccount.StorageAccountCredential u = new AzureStorageAccount.StorageAccountCredential(storageAccount, storageAccountKey, storageBlobURL, "");
         AzureStorageAccount storageCred = CredentialsMatchers.firstOrNull(CredentialsProvider.lookupCredentials(AzureStorageAccount.class, jenkinsInstance, ACL.SYSTEM, Collections.<DomainRequirement>emptyList()),
                 CredentialsMatchers.withId(u.getId()));
 
         assertEquals(u.getStorageAccountName(), storageCred.getStorageAccountName());
-        assertEquals(u.getEndpointURL(), storageCred.getBlobEndpointURL());
+        assertEquals(u.getBlobEndpointURL(), storageCred.getBlobEndpointURL());
         assertEquals(u.getSecureKey().getPlainText(), storageCred.getPlainStorageKey());
         
     }
@@ -110,8 +110,8 @@ public void testGetOldStorageConfig() throws Exception {
         System.out.println("getOldStorageConfig");
 
         List<StorageAccountInfo> expResult = new ArrayList<StorageAccountInfo>();
-        expResult.add(new StorageAccountInfo("abcdef", "12345", "http://test1/"));
-        expResult.add(new StorageAccountInfo("12345", "abcdef", "http://test2/"));
+        expResult.add(new StorageAccountInfo("abcdef", "12345", "http://test1/", ""));
+        expResult.add(new StorageAccountInfo("12345", "abcdef", "http://test2/", ""));
         
         File configFile = testFolder.newFile("test.xml");
         FileUtils.writeStringToFile(configFile, correctConfigContent);
diff --git a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest.java b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest.java
index 87cd7e8a..847ea8a5 100644
--- a/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest.java
+++ b/src/test/java/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest.java
@@ -26,13 +26,14 @@ public void testRenameStorageConfig() throws Exception {
         String storageAccount = "name";
         String storageAccountKey = "key";
         String storageBlobURL = "https://blob.core.windows.net/";
+        String storageCdnURL = "https://cdn-resource-name.azureedge.net/";
 
         CredentialsStore s = CredentialsProvider.lookupStores(j.jenkins).iterator().next();
 
         assertEquals(1, s.getCredentials(Domain.global()).size());
 
         AzureStorageAccount.StorageAccountCredential expected = new AzureStorageAccount.StorageAccountCredential(
-                storageAccount, storageAccountKey, storageBlobURL);
+                storageAccount, storageAccountKey, storageBlobURL, storageCdnURL);
 
         List<AzureStorageAccount> azureStorageAccounts = CredentialsProvider.lookupCredentials(
                 AzureStorageAccount.class,
@@ -44,7 +45,8 @@ public void testRenameStorageConfig() throws Exception {
         AzureStorageAccount storageCred = azureStorageAccounts.get(0);
 
         assertEquals(expected.getStorageAccountName(), storageCred.getStorageAccountName());
-        assertEquals(expected.getEndpointURL(), storageCred.getBlobEndpointURL());
+        assertEquals(expected.getBlobEndpointURL(), storageCred.getBlobEndpointURL());
+        assertEquals(expected.getCdnEndpointURL(), storageCred.getCdnEndpointURL());
         assertEquals(expected.getSecureKey().getPlainText(), storageCred.getPlainStorageKey());
     }
 }
diff --git a/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/configuration-as-code.yml b/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/configuration-as-code.yml
index 067b9f81..a9bbb89a 100644
--- a/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/configuration-as-code.yml
+++ b/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/configuration-as-code.yml
@@ -8,4 +8,12 @@ credentials:
               id: "storage-account"
               scope: GLOBAL
               storageAccountName: "a-storage-account"
-              storageKey: "Password12"
\ No newline at end of file
+              storageKey: "Password12"
+          - azureStorageAccount:
+              blobEndpointURL: "https://blob.core.windows.net/"
+              cdnEndpointURL: "https://cdn-resource-name.azureedge.net/"
+              description: "CDN Enabled Account"
+              id: "cdn-enabled-storage-account"
+              scope: GLOBAL
+              storageAccountName: "b-storage-account"
+              storageKey: "Password13"
diff --git a/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest/testRenameStorageConfig/credentials.xml b/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest/testRenameStorageConfig/credentials.xml
index 3127ec30..87b13629 100644
--- a/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest/testRenameStorageConfig/credentials.xml
+++ b/src/test/resources/com/microsoftopentechnologies/windowsazurestorage/helper/CredentialRenameTest/testRenameStorageConfig/credentials.xml
@@ -15,9 +15,10 @@
                         <storageAccountName>name</storageAccountName>
                         <storageAccountKey>key</storageAccountKey>
                         <blobEndpointURL>https://blob.core.windows.net/</blobEndpointURL>
+                        <cdnEndpointURL>https://cdn-resource-name.azureedge.net/</cdnEndpointURL>
                     </storageData>
                 </com.microsoftopentechnologies.windowsazurestorage.helper.AzureCredentials>
             </java.util.concurrent.CopyOnWriteArrayList>
         </entry>
     </domainCredentialsMap>
-</com.cloudbees.plugins.credentials.SystemCredentialsProvider>
\ No newline at end of file
+</com.cloudbees.plugins.credentials.SystemCredentialsProvider>