Skip to content
Merged
11 changes: 11 additions & 0 deletions src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,16 @@
*/
package hudson.plugins.ec2;

import hudson.Extension;
import java.util.List;
import org.kohsuke.stapler.DataBoundConstructor;

/**
* @deprecated use {@link EC2Cloud}
*/
@Deprecated
public class AmazonEC2Cloud extends EC2Cloud {
@DataBoundConstructor
public AmazonEC2Cloud(
String name,
boolean useInstanceProfileForCredentials,
Expand Down Expand Up @@ -75,4 +78,12 @@ public AmazonEC2Cloud(
roleArn,
roleSessionName);
}

@Extension
public static class DescriptorImpl extends EC2Cloud.DescriptorImpl {
@Override
public String getDisplayName() {
return "Amazon EC2 (Deprecated - use EC2 instead)";
}
}
}
4 changes: 4 additions & 0 deletions src/main/java/hudson/plugins/ec2/EC2Cloud.java
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,10 @@ public String getCloudName() {
return name;
}

public String getName() {
return name;
}

public String getRegion() {
if (region == null) {
region = DEFAULT_EC2_HOST; // Backward compatibility
Expand Down
106 changes: 105 additions & 1 deletion src/main/java/hudson/plugins/ec2/SlaveTemplate.java
Original file line number Diff line number Diff line change
Expand Up @@ -1653,7 +1653,7 @@
}
}

String getZone() {
public String getZone() {
return zone;
}

Expand Down Expand Up @@ -1926,6 +1926,106 @@
this.avoidUsingOrphanedNodes = avoidUsingOrphanedNodes;
}

public String getDescription() {
return description;
}

public String getType() {
return type;
}

public String getRemoteFS() {
return remoteFS;
}

public SpotConfiguration getSpotConfig() {
return spotConfig;
}

public String getSecurityGroups() {
return securityGroups;
}

public String getJavaPath() {
return javaPath;
}

public String getJvmopts() {
return jvmopts;
}

public boolean getStopOnTerminate() {
return stopOnTerminate;
}

public String getIdleTerminationMinutes() {
return idleTerminationMinutes;
}

public String getInitScript() {
return initScript;
}

public String getTmpDir() {
return tmpDir;
}

public String getUserData() {
return userData;
}

public boolean getConnectBySSHProcess() {
return connectBySSHProcess;
}

public boolean getConnectUsingPublicIp() {
return connectUsingPublicIp;

Check warning on line 1982 in src/main/java/hudson/plugins/ec2/SlaveTemplate.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 1982 is not covered by tests
}

public boolean getDeleteRootOnTermination() {
return deleteRootOnTermination;
}

public boolean getUseEphemeralDevices() {
return useEphemeralDevices;
}

public boolean getEbsOptimized() {
return ebsOptimized;
}

public boolean getMonitoring() {
return monitoring;
}

public boolean getT2Unlimited() {
return t2Unlimited;
}

public EbsEncryptRootVolume getEbsEncryptRootVolume() {
return ebsEncryptRootVolume;
}

public String getCustomDeviceMapping() {
return customDeviceMapping;
}

public Tenancy getTenancy() {
return tenancy;
}

public ConnectionStrategy getConnectionStrategy() {
return connectionStrategy;
}

public boolean getUseDedicatedTenancy() {
return useDedicatedTenancy;
}

public int getNextSubnet() {
return nextSubnet;

Check warning on line 2026 in src/main/java/hudson/plugins/ec2/SlaveTemplate.java

View check run for this annotation

ci.jenkins.io / Code Coverage

Not covered line

Line 2026 is not covered by tests
}

@Override
public String toString() {
return "SlaveTemplate{" + "description='" + description + '\'' + ", labels='" + labels + '\'' + '}';
Expand All @@ -1939,6 +2039,10 @@
return avoidUsingOrphanedNodes;
}

public boolean getAvoidUsingOrphanedNodes() {
return avoidUsingOrphanedNodes;
}

public Boolean getMetadataSupported() {
return metadataSupported;
}
Expand Down
Loading