Merge From Master

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# https://github.com/jenkinsci/ec2-plugin/pull/1011 Spotless
+98fc9a96b65375210d2dd3f9285d924d91582f3f

.mvn/extensions.xml

@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.8</version>
+    <version>1.13</version>
   </extension>
 </extensions>

Jenkinsfile

@@ -1,4 +1,3 @@
 buildPlugin(useContainerAgent: true, configurations: [
-    [platform: 'linux', jdk: '17'],
-    [ platform: 'linux', jdk: '21' ],
+    [ platform: 'linux', jdk: 25 ]
 ])

README.md

@@ -1,5 +1,6 @@
 # ec2-plugin
-[![Jenkins](https://ci.jenkins.io/job/Plugins/job/ec2-plugin/job/master/badge/icon)](https://ci.jenkins.io/job/Plugins/job/ec2-plugin/job/master/)
+
+[![Jenkins](https://ci.jenkins.io/buildStatus/icon?job=Plugins%2Fec2-plugin%2Fmaster)](https://ci.jenkins.io/job/Plugins/job/ec2-plugin/job/master/)
 [![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/ec2.svg)](https://plugins.jenkins.io/ec2)
 [![GitHub release](https://img.shields.io/github/release/jenkinsci/ec2-plugin.svg?label=changelog)](https://github.com/jenkinsci/ec2-plugin/releases/latest)
 [![Gitter](https://badges.gitter.im/ec2-plugin/Lobby.svg)](https://gitter.im/ec2-plugin/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
@@ -33,8 +34,7 @@
 # Introduction
 
 Allow Jenkins to start agents on
-[EC2](http://aws.amazon.com/ec2/) or
-[Eucalyptus](https://www.eucalyptus.cloud/) on demand, and
+[EC2](http://aws.amazon.com/ec2/) on demand, and
 kill them as they get unused.  
 
 With this plugin, if Jenkins notices that your build cluster is
@@ -52,14 +52,25 @@ the main "Manage Jenkins" \> "Configure System" page, and scroll down
 near the bottom to the "Cloud" section. There, you click the "Add a new
 cloud" button, and select the "Amazon EC2" option. This will display the
 UI for configuring the EC2 plugin.  Then enter the Access Key and Secret
-Access Key which act like a username/password (see IAM section). Because
-of the way EC2 works, you also need to have an RSA private key that the
+Access Key which act like a username/password (see IAM section). 
+
+Because of the way EC2 works, you also need to have an RSA private key that the
 cloud has the other half for, to permit sshing into the instances that
 are started. Please use the AWS console or any other tool of your choice
-to generate the private key to interactively log in to EC2 instances.
+to generate the private key to interactively log in to EC2 instances. 
+
+Once you have generated the needed private key you must either store it as
+a Jenkins `SSH Private Key` credential (and select that credential in your cloud
+config).
+
+If you do not want to create a new Jenkins credential you may alterantively store it
+in plain text on disk, indicating its file path via the Jenkins system property
+`hudson.plugins.ec2.EC2Cloud.sshPrivateKeyFilePath`.  If this system property has a non-empty value then
+it will override the ssh credential specified in the cloud configuration page.  This
+approach works well for `k8s` secrets that are mounted in a jenkins container for example.
 
-Once you have put in your Access Key and Secret Access Key, select a
-region for the cloud (not shown in screenshot). You may define only one
+Once you have put in your Access Key, Secret Access Key, and configured an ssh private key
+select a region for the cloud (not shown in screenshot). You may define only one
 cloud for each region, and the regions offered in the UI will show only
 the regions that you don't already have clouds defined for them.
 
@@ -283,12 +294,12 @@ console](https://wiki.jenkins.io/display/JENKINS/Jenkins+Script+Console),
 example:
 
 ```groovy
-import com.amazonaws.services.ec2.model.InstanceType
+import software.amazon.awssdk.services.ec2.model.InstanceType
 import com.cloudbees.jenkins.plugins.awscredentials.AWSCredentialsImpl
 import com.cloudbees.plugins.credentials.*
 import com.cloudbees.plugins.credentials.domains.Domain
 import hudson.model.*
-import hudson.plugins.ec2.AmazonEC2Cloud
+import hudson.plugins.ec2.EC2Cloud
 import hudson.plugins.ec2.AMITypeData
 import hudson.plugins.ec2.EC2Tag
 import hudson.plugins.ec2.SlaveTemplate
@@ -305,7 +316,7 @@ def sshPortToConnectWith = '22'
 // store parameters
 def slaveTemplateUsEast1Parameters = [
   ami:                           'ami-AAAAAAAA',
-  associatePublicIp:             false,
+  associateIpStrategy:           AssociateIpStrategy.valueOf('PRIVATE_IP'),
   spotConfig:                    null,
   connectBySSHProcess:           false,
   connectUsingPublicIp:          false,
@@ -340,6 +351,7 @@ def slaveTemplateUsEast1Parameters = [
   metadataEndpointEnabled:       true,
   metadataTokensRequired:        true, // `true` enforces IMDSv2 only (over IMDSv1), an important AWS security best practice
   metadataHopsLimit:             1,
+  enclaveEnabled:                true, // launches the instance with Nitro Enclave enabled
   minimumNumberOfInstances:      0,
   minimumNumberOfSpareInstances: 0,
   maxTotalUses:                  -1,
@@ -352,7 +364,7 @@ def slaveTemplateUsEast1Parameters = [
   nodeProperties:                null
 ]
 
-def AmazonEC2CloudParameters = [
+def EC2CloudParameters = [
   name:      'MyCompany',
   credentialsId:  'jenkins-aws-key',
   instanceCapStr: '2',
@@ -434,7 +446,7 @@ SlaveTemplate slaveTemplateUsEast1 = new SlaveTemplate(
   slaveTemplateUsEast1Parameters.deleteRootOnTermination,
   slaveTemplateUsEast1Parameters.useEphemeralDevices,
   slaveTemplateUsEast1Parameters.launchTimeoutStr,
-  slaveTemplateUsEast1Parameters.associatePublicIp,
+  slaveTemplateUsEast1Parameters.associateIpStrategy,
   slaveTemplateUsEast1Parameters.customDeviceMapping,
   slaveTemplateUsEast1Parameters.connectBySSHProcess,
   slaveTemplateUsEast1Parameters.monitoring,
@@ -449,16 +461,17 @@ SlaveTemplate slaveTemplateUsEast1 = new SlaveTemplate(
   slaveTemplateUsEast1Parameters.metadataEndpointEnabled,
   slaveTemplateUsEast1Parameters.metadataTokensRequired,
   slaveTemplateUsEast1Parameters.metadataHopsLimit,
+  slaveTemplateUsEast1Parameters.enclaveEnabled,
 )
 
-// https://javadoc.jenkins.io/plugin/ec2/index.html?hudson/plugins/ec2/AmazonEC2Cloud.html
-AmazonEC2Cloud amazonEC2Cloud = new AmazonEC2Cloud(
-  AmazonEC2CloudParameters.name,
-  AmazonEC2CloudParameters.useInstanceProfileForCredentials,
-  AmazonEC2CloudParameters.credentialsId,
-  AmazonEC2CloudParameters.region,
-  AmazonEC2CloudParameters.privateKey,
-  AmazonEC2CloudParameters.instanceCapStr,
+// https://javadoc.jenkins.io/plugin/ec2/hudson/plugins/ec2/EC2Cloud.html
+EC2Cloud ec2Cloud = new EC2Cloud(
+  EC2CloudParameters.name,
+  EC2CloudParameters.useInstanceProfileForCredentials,
+  EC2CloudParameters.credentialsId,
+  EC2CloudParameters.region,
+  EC2CloudParameters.privateKey,
+  EC2CloudParameters.instanceCapStr,
   [slaveTemplateUsEast1],
   '',
   ''
@@ -477,7 +490,7 @@ def store = jenkins.getExtensionList('com.cloudbees.plugins.credentials.SystemCr
 store.addCredentials(domain, aWSCredentialsImpl)
 
 // add cloud configuration to Jenkins
-jenkins.clouds.add(amazonEC2Cloud)
+jenkins.clouds.add(ec2Cloud)
 
 // save current Jenkins state to disk
 jenkins.save()
@@ -493,7 +506,7 @@ Example:
 ```java
  // Assuming on the Jenkins instance, there exists an EC2Cloud with the name "AwsCloud"
 
- AmazonEC2Cloud cloud = (AmazonEC2Cloud) Jenkins.get().clouds.stream().filter(cloud1 -> Objects.equals(cloud.getDisplayName(), "AwsCloud")).findFirst().get();
+ EC2Cloud cloud = (EC2Cloud) Jenkins.get().clouds.stream().filter(cloud1 -> Objects.equals(cloud.getDisplayName(), "AwsCloud")).findFirst().get();
 
  SlaveTemplate template = new SlaveTemplate(/*constructor*/); // View available constructors at https://github.com/jenkinsci/ec2-plugin/blob/master/src/main/java/hudson/plugins/ec2/SlaveTemplate.java