Merge pull request #537 from MRamonLeon/JENKINS-60482-just-keep-alt-e…

…ndpoint
jenkinsci · Nov 24, 2020 · 0780e33 · 0780e33
2 parents 7f8196c + aea5484
commit 0780e33
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 0 deletions.
diff --git a/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java b/src/main/java/hudson/plugins/ec2/AmazonEC2Cloud.java
@@ -64,6 +64,8 @@ public class AmazonEC2Cloud extends EC2Cloud {
      */
     private String region;
 
+    private String altEC2Endpoint;
+
     public static final String CLOUD_ID_PREFIX = "ec2-";
 
     private boolean noDelayProvisioning;
@@ -134,6 +136,15 @@ public void setNoDelayProvisioning(boolean noDelayProvisioning) {
         this.noDelayProvisioning = noDelayProvisioning;
     }
 
+    public String getAltEC2Endpoint() {
+        return altEC2Endpoint;
+    }
+
+    @DataBoundSetter
+    public void setAltEC2Endpoint(String altEC2Endpoint) {
+        this.altEC2Endpoint = altEC2Endpoint;
+    }
+
     @Override
     protected AWSCredentialsProvider createCredentialsProvider() {
         return createCredentialsProvider(isUseInstanceProfileForCredentials(), getCredentialsId(), getRoleArn(), getRoleSessionName(), getRegion());

diff --git a/src/test/java/hudson/plugins/ec2/ConfigurationAsCodeTest.java b/src/test/java/hudson/plugins/ec2/ConfigurationAsCodeTest.java
@@ -149,6 +149,17 @@ public void testConfigAsCodeExport() throws Exception {
         assertEquals(expected, exported);
     }
 
+    @Test
+    @ConfiguredWithCode("UnixData-withAltEndpoint.yml")
+    public void testConfigAsCodeWithAltEncpointExport() throws Exception {
+        ConfiguratorRegistry registry = ConfiguratorRegistry.get();
+        ConfigurationContext context = new ConfigurationContext(registry);
+        CNode clouds = getJenkinsRoot(context).get("clouds");
+        String exported = toYamlString(clouds);
+        String expected = toStringFromYamlFile(this, "UnixDataExport-withAltEndpoint.yml");
+        assertEquals(expected, exported);
+    }
+
     @Test
     @ConfiguredWithCode("Ami.yml")
     public void testAmi() throws Exception {

diff --git a/src/test/resources/hudson/plugins/ec2/UnixData-withAltEndpoint.yml b/src/test/resources/hudson/plugins/ec2/UnixData-withAltEndpoint.yml
@@ -0,0 +1,27 @@
+---
+jenkins:
+  clouds:
+    - amazonEC2:
+        altEC2Endpoint: "https.//ec2.us-east-1.amazonaws.com"
+        cloudName: "production"
+        region: "eu-central-1"
+        useInstanceProfileForCredentials: true
+        sshKeysCredentialsId: "random credentials id"
+        templates:
+          - description:
+            ami: "ami-12345"
+            labelString: "linux ubuntu"
+            type: "T2Micro"
+            remoteFS: "/home/ec2-user"
+            mode: "NORMAL"
+            spotConfig:
+              fallbackToOndemand: true
+              spotBlockReservationDuration: 3
+              spotMaxBidPrice: "0.15"
+              useBidPrice: true
+            amiType:
+              unixData:
+                rootCommandPrefix: "sudo"
+                slaveCommandPrefix: "sudo -u jenkins"
+                slaveCommandSuffix: "-fakeFlag"
+                sshPort: "22"
diff --git a/src/test/resources/hudson/plugins/ec2/UnixDataExport-withAltEndpoint.yml b/src/test/resources/hudson/plugins/ec2/UnixDataExport-withAltEndpoint.yml
@@ -0,0 +1,38 @@
+- amazonEC2:
+    altEC2Endpoint: "https.//ec2.us-east-1.amazonaws.com"
+    cloudName: "production"
+    region: "eu-central-1"
+    sshKeysCredentialsId: "random credentials id"
+    templates:
+    - ami: "ami-12345"
+      amiType:
+        unixData:
+          rootCommandPrefix: "sudo"
+          slaveCommandPrefix: "sudo -u jenkins"
+          slaveCommandSuffix: "-fakeFlag"
+          sshPort: "22"
+      associatePublicIp: false
+      connectBySSHProcess: false
+      connectionStrategy: PRIVATE_IP
+      deleteRootOnTermination: false
+      ebsOptimized: false
+      hostKeyVerificationStrategy: CHECK_NEW_SOFT
+      labelString: "linux ubuntu"
+      maxTotalUses: -1
+      minimumNumberOfInstances: 0
+      minimumNumberOfSpareInstances: 0
+      mode: NORMAL
+      monitoring: false
+      numExecutors: 1
+      remoteFS: "/home/ec2-user"
+      spotConfig:
+        fallbackToOndemand: true
+        spotBlockReservationDuration: 3
+        spotMaxBidPrice: "0.15"
+        useBidPrice: true
+      stopOnTerminate: false
+      t2Unlimited: false
+      type: T2Micro
+      useDedicatedTenancy: false
+      useEphemeralDevices: false
+    useInstanceProfileForCredentials: true