Merge pull request #1153 from apuig/JENKINS-75002-associate-ip-strategy-fix-compat

Fix associatePublicIp backward compatible.

Author: apuig

src/main/java/hudson/plugins/ec2/SlaveTemplate.java

@@ -1744,6 +1744,13 @@ public boolean getAssociatePublicIp() {
         return AssociateIPStrategy.PUBLIC_IP == associateIPStrategy;
     }
 
+    @Deprecated
+    @DataBoundSetter
+    public void setAssociatePublicIp(boolean associatePublicIp) {
+        this.associatePublicIp = associatePublicIp;
+        this.associateIPStrategy = AssociateIPStrategy.backwardsCompatible(associatePublicIp);
+    }
+
     public AssociateIPStrategy getAssociateIPStrategy() {
         return associateIPStrategy;
     }

src/test/java/hudson/plugins/ec2/ConfigurationAsCodeTest.java

@@ -168,7 +168,7 @@ void testBackwardsCompatibleAssociateIPStrategyFalse(JenkinsConfiguredWithCodeRu
         assertEquals(1, templates.size());
         final SlaveTemplate slaveTemplate = templates.get(0);
         assertNull(slaveTemplate.spotConfig);
-        assertEquals(AssociateIPStrategy.SUBNET, slaveTemplate.associateIPStrategy);
+        assertEquals(AssociateIPStrategy.DEFAULT, slaveTemplate.associateIPStrategy);
     }
 
     @Test
@@ -181,7 +181,7 @@ void testBackwardsCompatibleAssociateIPStrategyFalseSpot(JenkinsConfiguredWithCo
         assertEquals(1, templates.size());
         final SlaveTemplate slaveTemplate = templates.get(0);
         assertNotNull(slaveTemplate.spotConfig);
-        assertEquals(AssociateIPStrategy.PRIVATE_IP, slaveTemplate.associateIPStrategy);
+        assertEquals(AssociateIPStrategy.DEFAULT, slaveTemplate.associateIPStrategy);
     }
 
     @Test

src/test/resources/hudson/plugins/ec2/BackwardsCompatibleAssignIPStrategyUsePublicIp.yml

@@ -1,9 +1,11 @@
 ---
 configuration-as-code:
+  deprecated: warn
 jenkins:
   clouds:
     - amazonEC2:
-        name: "staging"
+        name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
-        - associatePublicIp: true
+          - description:
+            associatePublicIp: true

src/test/resources/hudson/plugins/ec2/BackwardsCompatibleAssignIPStrategyUsePublicIpFalse.yml

@@ -1,9 +1,11 @@
 ---
 configuration-as-code:
+  deprecated: warn
 jenkins:
   clouds:
     - amazonEC2:
-        name: "staging"
+        name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
-        - associatePublicIp: false
+          - description:
+            associatePublicIp: false

src/test/resources/hudson/plugins/ec2/BackwardsCompatibleAssignIPStrategyUsePublicIpFalseSpot.yml

@@ -1,11 +1,13 @@
 ---
 configuration-as-code:
+  deprecated: warn
 jenkins:
   clouds:
     - amazonEC2:
-        name: "staging"
+        name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
-        - associatePublicIp: false
-          spotConfig:
-            useBidPrice: true
+          - description:
+            associatePublicIp: false
+            spotConfig:
+              useBidPrice: true

src/test/resources/hudson/plugins/ec2/BackwardsCompatibleAssignIPStrategyUsePublicIpSpot.yml

@@ -1,11 +1,13 @@
 ---
 configuration-as-code:
+  deprecated: warn
 jenkins:
   clouds:
     - amazonEC2:
-        name: "staging"
+        name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
-        - associatePublicIp: true
-          spotConfig:
-            useBidPrice: true
+          - description:
+            associatePublicIp: true
+            spotConfig:
+              useBidPrice: true

src/test/resources/hudson/plugins/ec2/BackwardsCompatibleConnectionStrategy.yml

@@ -7,6 +7,7 @@ jenkins:
         name: "us-east-1"
         privateKey: "${PRIVATE_KEY}"
         templates:
-        - associatePublicIp: false
-          connectUsingPublicIp: false
-          usePrivateDnsName: true
+          - description:
+            connectUsingPublicIp: false
+            usePrivateDnsName: true
+