Merge branch 'master' into master

Author: hoegertn

README.md

@@ -1099,6 +1099,30 @@ ebWaitOnEnvironmentHealth(
 
 ## current master
 
+## 1.45
+### Enhanced ECS and Lambda Deployment Support
+
+We've improved the `CreateDeployStep` class to better handle ECS and Lambda deployments:
+
+1. Added a new method `isEcsOrLambdaDeployment()` to detect if the deployment is for ECS or Lambda.
+2. Modified the `getFileExistsBehavior()` method to skip setting `FileExistsBehavior` for ECS and Lambda deployments.
+3. These changes ensure that the `fileExistsBehavior` parameter is only set for EC2/On-premises deployments, avoiding potential issues with ECS and Lambda deployments.
+
+### New Dependencies
+
+The following new imports have been added to support these changes:
+
+- `com.amazonaws.services.codedeploy.model.GetDeploymentGroupRequest`
+- `com.amazonaws.services.codedeploy.model.GetDeploymentGroupResult`
+- `com.amazonaws.services.codedeploy.model.DeploymentGroupInfo`
+
+### Improved Error Handling
+
+The `isEcsOrLambdaDeployment()` method includes basic error handling to gracefully handle any exceptions that may occur when querying the deployment group information.
+
+These updates enhance the plugin's compatibility with different AWS CodeDeploy compute platforms while maintaining existing functionality for EC2/On-premises deployments.
+
+
 ## 1.44
 * Fix global configuration naming for JCasC. Please note that this is a breaking change if JCasC is defined. This can be fixed by renaming pluginImpl --> pipelineStepsAWS.
 * Fix Elastic Beanstalk client creation bug that ignored provided configurations in the withAWSStep

pom.xml

@@ -22,7 +22,7 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.414.x</artifactId>
+                <artifactId>bom-${jenkins.baseline}.x</artifactId>
                 <version>2928.ved44ea_84e034</version>
                 <scope>import</scope>
                 <type>pom</type>
@@ -78,7 +78,9 @@
     <properties>
         <revision>1.46</revision>
         <changelist>-SNAPSHOT</changelist>
-        <jenkins.version>2.414.3</jenkins.version>
+        <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+        <jenkins.baseline>2.414</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
     </properties>
     <build>
@@ -254,4 +256,4 @@
 
     </dependencies>
 
-</project>
+</project>

src/main/java/de/taimos/pipeline/aws/code/deploy/CreateDeployStep.java

@@ -9,6 +9,9 @@
 import com.amazonaws.services.codedeploy.model.RevisionLocation;
 import com.amazonaws.services.codedeploy.model.RevisionLocationType;
 import com.amazonaws.services.codedeploy.model.S3Location;
+import com.amazonaws.services.codedeploy.model.GetDeploymentGroupRequest;
+import com.amazonaws.services.codedeploy.model.GetDeploymentGroupResult;
+import com.amazonaws.services.codedeploy.model.DeploymentGroupInfo;
 import de.taimos.pipeline.aws.AWSClientFactory;
 import de.taimos.pipeline.aws.utils.StepUtils;
 import hudson.Extension;
@@ -160,9 +163,13 @@ protected Void run() throws Exception {
 					.withDeploymentConfigName(step.getDeploymentConfigName())
 					.withDescription(step.getDescription())
 					.withRevision(getRevisionLocation())
-					.withFileExistsBehavior(getFileExistsBehavior(step.getFileExistsBehavior()))
 					.withIgnoreApplicationStopFailures(step.getIgnoreApplicationStopFailures());
 
+			FileExistsBehavior fileExistsBehavior = getFileExistsBehavior(step.getFileExistsBehavior());
+			if (fileExistsBehavior != null) {
+				deploymentRequest.withFileExistsBehavior(fileExistsBehavior);
+			}
+
 			CreateDeploymentResult deployment = client.createDeployment(deploymentRequest);
 
 			listener.getLogger().format("DeploymentId (%s) %n", deployment.getDeploymentId());
@@ -176,12 +183,36 @@ protected Void run() throws Exception {
 		}
 
 		private FileExistsBehavior getFileExistsBehavior(String fileExistsBehavior) {
+			if (isEcsOrLambdaDeployment()) {
+				return null;
+			}
 			if (StringUtils.isEmpty(fileExistsBehavior)) {
 				return FileExistsBehavior.DISALLOW;
 			}
 			return FileExistsBehavior.fromValue(fileExistsBehavior);
 		}
 
+		private boolean isEcsOrLambdaDeployment() {
+			AmazonCodeDeploy codeDeploy = AWSClientFactory.create(AmazonCodeDeployClientBuilder.standard(), this.getContext());
+			
+			try {
+				GetDeploymentGroupRequest request = 
+					new GetDeploymentGroupRequest()
+						.withApplicationName(step.getApplicationName())
+						.withDeploymentGroupName(step.getDeploymentGroupName());
+				
+				GetDeploymentGroupResult response = 
+					codeDeploy.getDeploymentGroup(request);
+				
+				String computePlatform = response.getDeploymentGroupInfo().getComputePlatform();
+				
+				return "ECS".equalsIgnoreCase(computePlatform) || "Lambda".equalsIgnoreCase(computePlatform);
+			} catch (Exception e) {
+				// Log the exception or handle it as appropriate for your use case
+				return false;
+			}
+		}
+
 		private RevisionLocation getRevisionLocation() {
 			if (StringUtils.isNotEmpty(step.getS3Bucket())) {
 				final S3Location s3Location = new S3Location().withBucket(step.getS3Bucket())
@@ -201,4 +232,4 @@ private RevisionLocation getRevisionLocation() {
 		private static final long serialVersionUID = 1L;
 
 	}
-}
+}