[JENKINS-71737] rename cloudName to name (#462)

Co-authored-by: Tim Jacomb <timjacomb1@gmail.com>
jenkinsci · Sep 14, 2023 · 63c930b · 63c930b
1 parent edc8876
commit 63c930b
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -47,7 +47,7 @@
         <gitHubRepo>jenkinsci/azure-vm-agents-plugin</gitHubRepo>
         <jenkins.version>2.387.3</jenkins.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
-        <hpi.compatibleSinceVersion>846</hpi.compatibleSinceVersion>
+        <hpi.compatibleSinceVersion>883</hpi.compatibleSinceVersion>
     </properties>
 
     <dependencyManagement>

diff --git a/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java b/src/main/java/com/microsoft/azure/vmagent/AzureVMCloud.java
@@ -135,7 +135,7 @@ public class AzureVMCloud extends Cloud {
 
     @DataBoundConstructor
     public AzureVMCloud(
-            String cloudName,
+            String name,
             String azureCredentialsId,
             String maxVirtualMachinesLimit,
             String deploymentTimeout,
@@ -145,7 +145,7 @@ public AzureVMCloud(
             List<AzureVMAgentTemplate> vmTemplates) {
         super(
                 getOrGenerateCloudName(
-                        cloudName,
+                        name,
                         azureCredentialsId,
                         getResourceGroupName(
                                 resourceGroupReferenceType,
@@ -268,10 +268,10 @@ public String getCloudName() {
         return this.name;
     }
 
-    public static String getOrGenerateCloudName(String cloudName, String credentialId, String resourceGroupName) {
-        return StringUtils.isBlank(cloudName)
+    public static String getOrGenerateCloudName(String name, String credentialId, String resourceGroupName) {
+        return StringUtils.isBlank(name)
                 ? AzureUtil.getCloudName(credentialId, resourceGroupName)
-                : cloudName;
+                : name;
     }
 
     public String getNewResourceGroupName() {

diff --git a/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly b/src/main/resources/com/microsoft/azure/vmagent/AzureVMCloud/config.jelly
@@ -4,7 +4,7 @@
   <f:block>
     <a href="${rootURL}/log/${descriptor.logRecorderName}/" target="_blank">${%Azure_VM_Agent_Log_Link}</a>
   </f:block>
-  <f:entry title="${%Cloud_Name}" field="cloudName"
+  <f:entry title="${%Cloud_Name}" field="name"
            help="/plugin/azure-vm-agents/help-cloudName.html">
     <f:textbox/>
   </f:entry>

diff --git a/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/advanced.yaml b/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/advanced.yaml
@@ -2,7 +2,7 @@ jenkins:
   clouds:
     - azureVM:
         azureCredentialsId: "azure-cred"
-        cloudName: "azure"
+        name: "azure"
         cloudTags:
           - name: "author"
             value: "gavin"

diff --git a/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/basic.yaml b/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/basic.yaml
@@ -2,7 +2,7 @@ jenkins:
   clouds:
     - azureVM:
         azureCredentialsId: "azure-cred"
-        cloudName: "azure"
+        name: "azure"
         deploymentTimeout: 1200
         maxVirtualMachinesLimit: 10
         newResourceGroupName: "vm-agent"

diff --git a/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/expectedAdvanced.yaml b/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/expectedAdvanced.yaml
@@ -1,12 +1,12 @@
 - azureVM:
     azureCredentialsId: "azure-cred"
-    cloudName: "azure"
     cloudTags:
     - name: "author"
       value: "gavin"
     deploymentTimeout: 1200
     existingResourceGroupName: "vm-agents"
     maxVirtualMachinesLimit: 10
+    name: "azure"
     resourceGroupReferenceType: "existing"
     vmTemplates:
     - agentWorkspace: "/opt/jenkins"

diff --git a/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/expectedBasic.yaml b/src/test/resources/com/microsoft/azure/vmagent/test/jcasc/expectedBasic.yaml
@@ -1,8 +1,8 @@
 - azureVM:
     azureCredentialsId: "azure-cred"
-    cloudName: "azure"
     deploymentTimeout: 1200
     maxVirtualMachinesLimit: 10
+    name: "azure"
     newResourceGroupName: "vm-agent"
     resourceGroupReferenceType: "new"
     vmTemplates: