diff --git a/README.md b/README.md index 483424d59..3548b51e1 100644 --- 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 index b006224d1..e25799c30 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,7 @@ THE SOFTWARE. 999999-SNAPSHOT 2.414 jenkinsci/${project.artifactId}-plugin + 1626 diff --git a/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java b/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java index 6bb61d383..0441987a4 100644 --- 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 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 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 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 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 index 6e8c276b9..c0631206d 100644 --- 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. --> - + diff --git a/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java b/src/test/java/hudson/plugins/ec2/AmazonEC2CloudTest.java index 09a991a15..758bdaafd 100644 --- 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 index 165d8b1a6..4f31e9fd5 100644 --- 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 index 0abb97154..cefc4c3b1 100644 --- 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 index 114db2f8c..dad5e0bea 100644 --- 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 index 9795f3d88..c1d160364 100644 --- 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 index db40ede5b..bb637519b 100644 --- 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 index f8c9427dc..bf6f1eee8 100644 --- 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 index 232537c08..402d00fa2 100644 --- 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 index af8675463..13081a0f0 100644 --- 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 index bc8ef6560..bcaeb6dd6 100644 --- 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 index ee9ebb425..c7237d80e 100644 --- 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 index 78d666595..3c6b208bb 100644 --- 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 index af93d9d4b..a2c23fa65 100644 --- 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 index 61a8843dc..31bc37f15 100644 --- 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: