jenkinsci · res0nance · Sep 15, 2023 · Sep 13, 2023 · Sep 15, 2023
diff --git a/README.md b/README.md
@@ -353,7 +353,7 @@ def slaveTemplateUsEast1Parameters = [
 ]
 
 def AmazonEC2CloudParameters = [
-  cloudName:      'MyCompany',
+  name:      'MyCompany',
   credentialsId:  'jenkins-aws-key',
   instanceCapStr: '2',
   privateKey:     '''-----BEGIN RSA PRIVATE KEY-----
@@ -453,7 +453,7 @@ SlaveTemplate slaveTemplateUsEast1 = new SlaveTemplate(
 
 // https://javadoc.jenkins.io/plugin/ec2/index.html?hudson/plugins/ec2/AmazonEC2Cloud.html
 AmazonEC2Cloud amazonEC2Cloud = new AmazonEC2Cloud(
-  AmazonEC2CloudParameters.cloudName,
+  AmazonEC2CloudParameters.name,
   AmazonEC2CloudParameters.useInstanceProfileForCredentials,
   AmazonEC2CloudParameters.credentialsId,
   AmazonEC2CloudParameters.region,

diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,7 @@ THE SOFTWARE.
         <changelist>999999-SNAPSHOT</changelist>
         <jenkins.version>2.414</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+        <hpi.compatibleSinceVersion>1626</hpi.compatibleSinceVersion>
     </properties>
 
     <dependencies>

diff --git a/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java b/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
@@ -74,14 +74,14 @@ public class AmazonEC2Cloud extends EC2Cloud {
     private boolean noDelayProvisioning;
 
     @DataBoundConstructor
-    public AmazonEC2Cloud(String cloudName, boolean useInstanceProfileForCredentials, String credentialsId, String region, String privateKey, String sshKeysCredentialsId, String instanceCapStr, List<? extends SlaveTemplate> templates, String roleArn, String roleSessionName) {
-        super(cloudName, useInstanceProfileForCredentials, credentialsId, privateKey, sshKeysCredentialsId, instanceCapStr, templates, roleArn, roleSessionName);
+    public AmazonEC2Cloud(String name, boolean useInstanceProfileForCredentials, String credentialsId, String region, String privateKey, String sshKeysCredentialsId, String instanceCapStr, List<? extends SlaveTemplate> templates, String roleArn, String roleSessionName) {
+        super(name, useInstanceProfileForCredentials, credentialsId, privateKey, sshKeysCredentialsId, instanceCapStr, templates, roleArn, roleSessionName);
         this.region = region;
     }
 
     @Deprecated
-    public AmazonEC2Cloud(String cloudName, boolean useInstanceProfileForCredentials, String credentialsId, String region, String privateKey, String instanceCapStr, List<? extends SlaveTemplate> templates, String roleArn, String roleSessionName) {
-        super(cloudName, useInstanceProfileForCredentials, credentialsId, privateKey, instanceCapStr, templates, roleArn, roleSessionName);
+    public AmazonEC2Cloud(String name, boolean useInstanceProfileForCredentials, String credentialsId, String region, String privateKey, String instanceCapStr, List<? extends SlaveTemplate> templates, String roleArn, String roleSessionName) {
+        super(name, useInstanceProfileForCredentials, credentialsId, privateKey, instanceCapStr, templates, roleArn, roleSessionName);
         this.region = region;
     }
 

diff --git a/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly b/src/main/resources/hudson/plugins/ec2/AmazonEC2Cloud/config-entries.jelly
@@ -19,7 +19,7 @@ THE SOFTWARE.
 -->
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:c="/lib/credentials">
-  <f:entry title="${%Name}" field="cloudName">
+  <f:entry title="${%Name}" field="name">
     <f:textbox />
   </f:entry>
   <f:entry field="credentialsId" title="${%Amazon EC2 Credentials}" description="AWS IAM Access Key used to connect to EC2. If not specified, implicit authentication mechanisms are used (IAM roles...)">

diff --git a/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java b/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java
@@ -74,7 +74,7 @@ public void setUp() throws Exception {
     @Test
     public void testConfigRoundtrip() throws Exception {
         r.submit(getConfigForm());
-        r.assertEqualBeans(cloud, r.jenkins.clouds.get(AmazonEC2Cloud.class), "cloudName,region,useInstanceProfileForCredentials,privateKey,instanceCap,roleArn,roleSessionName");
+        r.assertEqualBeans(cloud, r.jenkins.clouds.get(AmazonEC2Cloud.class), "name,region,useInstanceProfileForCredentials,privateKey,instanceCap,roleArn,roleSessionName");
     }
 
     @Test
@@ -94,7 +94,7 @@ public void testSshKeysCredentialsIdRemainsUnchangedAfterUpdatingOtherFields() t
         r.submit(form);
         AmazonEC2Cloud actual = r.jenkins.clouds.get(AmazonEC2Cloud.class);
         assertEquals("updatedSessionName", actual.getRoleSessionName());
-        r.assertEqualBeans(cloud, actual, "cloudName,region,useInstanceProfileForCredentials,sshKeysCredentialsId,instanceCap,roleArn");
+        r.assertEqualBeans(cloud, actual, "name,region,useInstanceProfileForCredentials,sshKeysCredentialsId,instanceCap,roleArn");
     }
 
     @Test

diff --git a/src/test/resources/hudson/plugins/ec2/Ami.yml b/src/test/resources/hudson/plugins/ec2/Ami.yml
@@ -4,7 +4,7 @@ configuration-as-code:
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "test"
+        name: "test"
         privateKey: "${PRIVATE_KEY}"
         templates:
           - ami: ami-0123456789abcdefg

diff --git a/src/test/resources/hudson/plugins/ec2/BackwardsCompatibleConnectionStrategy.yml b/src/test/resources/hudson/plugins/ec2/BackwardsCompatibleConnectionStrategy.yml
@@ -4,7 +4,7 @@ configuration-as-code:
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "us-east-1"
+        name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
         - associatePublicIp: false

diff --git a/src/test/resources/hudson/plugins/ec2/EC2CloudEmpty.yml b/src/test/resources/hudson/plugins/ec2/EC2CloudEmpty.yml
@@ -2,5 +2,5 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "empty"
+        name: "empty"
         privateKey: "${PRIVATE_KEY}"
diff --git a/src/test/resources/hudson/plugins/ec2/Mac.yml b/src/test/resources/hudson/plugins/ec2/Mac.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "staging"
+        name: "staging"
         useInstanceProfileForCredentials: true
         privateKey: "${PRIVATE_KEY}"
         templates:

diff --git a/src/test/resources/hudson/plugins/ec2/MacData.yml b/src/test/resources/hudson/plugins/ec2/MacData.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "production"
+        name: "production"
         useInstanceProfileForCredentials: true
         sshKeysCredentialsId: "random credentials id"
         templates:

diff --git a/src/test/resources/hudson/plugins/ec2/MacDataExport.yml b/src/test/resources/hudson/plugins/ec2/MacDataExport.yml
@@ -1,5 +1,5 @@
 - amazonEC2:
-    cloudName: "production"
+    name: "production"
     region: "us-east-1"
     sshKeysCredentialsId: "random credentials id"
     templates:

diff --git a/src/test/resources/hudson/plugins/ec2/Unix-withMinimumInstancesTimeRange.yml b/src/test/resources/hudson/plugins/ec2/Unix-withMinimumInstancesTimeRange.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "timed"
+        name: "timed"
         useInstanceProfileForCredentials: true
         sshKeysCredentialsId: "random credentials id"
         templates:

diff --git a/src/test/resources/hudson/plugins/ec2/Unix.yml b/src/test/resources/hudson/plugins/ec2/Unix.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "staging"
+        name: "staging"
         useInstanceProfileForCredentials: true
         privateKey: "${PRIVATE_KEY}"
         templates:

diff --git a/src/test/resources/hudson/plugins/ec2/UnixData-withAltEndpointAndJavaPath.yml b/src/test/resources/hudson/plugins/ec2/UnixData-withAltEndpointAndJavaPath.yml
@@ -3,7 +3,7 @@ jenkins:
   clouds:
     - amazonEC2:
         altEC2Endpoint: "https.//ec2.us-east-1.amazonaws.com"
-        cloudName: "production"
+        name: "production"
         region: "eu-central-1"
         useInstanceProfileForCredentials: true
         sshKeysCredentialsId: "random credentials id"

diff --git a/src/test/resources/hudson/plugins/ec2/UnixData.yml b/src/test/resources/hudson/plugins/ec2/UnixData.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "production"
+        name: "production"
         useInstanceProfileForCredentials: true
         sshKeysCredentialsId: "random credentials id"
         templates:

diff --git a/src/test/resources/hudson/plugins/ec2/UnixDataExport-withAltEndpointAndJavaPath.yml b/src/test/resources/hudson/plugins/ec2/UnixDataExport-withAltEndpointAndJavaPath.yml
@@ -1,6 +1,6 @@
 - amazonEC2:
     altEC2Endpoint: "https.//ec2.us-east-1.amazonaws.com"
-    cloudName: "production"
+    name: "production"
     region: "eu-central-1"
     sshKeysCredentialsId: "random credentials id"
     templates:

diff --git a/src/test/resources/hudson/plugins/ec2/UnixDataExport.yml b/src/test/resources/hudson/plugins/ec2/UnixDataExport.yml
@@ -1,5 +1,5 @@
 - amazonEC2:
-    cloudName: "production"
+    name: "production"
     region: "us-east-1"
     sshKeysCredentialsId: "random credentials id"
     templates:

diff --git a/src/test/resources/hudson/plugins/ec2/WindowsData.yml b/src/test/resources/hudson/plugins/ec2/WindowsData.yml
@@ -2,7 +2,7 @@
 jenkins:
   clouds:
     - amazonEC2:
-        cloudName: "development"
+        name: "development"
         useInstanceProfileForCredentials: true
         privateKey: "${PRIVATE_KEY}"
         templates: