Merge pull request #183 from tkgregory/master

dai0304 · web-flow · commit dda1618da77d · 2019-09-23T23:47:50.000+09:00
Set roleArn on the awsCfnMigrateStack task.
diff --git a/src/main/java/jp/classmethod/aws/gradle/cloudformation/AmazonCloudFormationMigrateStackTask.java b/src/main/java/jp/classmethod/aws/gradle/cloudformation/AmazonCloudFormationMigrateStackTask.java
@@ -66,6 +66,10 @@ public class AmazonCloudFormationMigrateStackTask extends ConventionTask {
 	@Setter
 	private List<Tag> cfnStackTags = new ArrayList<>();
 	
+	@Getter
+	@Setter
+	private String cfnRoleArn;
+	
 	@Getter
 	@Setter
 	private boolean capabilityIam;
@@ -149,6 +153,7 @@ private void updateStack(AmazonCloudFormation cfn) throws IOException {
 		File cfnTemplateFile = getCfnTemplateFile();
 		List<Parameter> cfnStackParams = getCfnStackParams();
 		List<Tag> cfnStackTags = getCfnStackTags();
+		String cfnRoleArn = getCfnRoleArn();
 		String cfnStackPolicyUrl = getCfnStackPolicyUrl();
 		File cfnStackPolicyFile = getCfnStackPolicyFile();
 		
@@ -165,7 +170,8 @@ private void updateStack(AmazonCloudFormation cfn) throws IOException {
 		UpdateStackRequest req = new UpdateStackRequest()
 			.withStackName(stackName)
 			.withParameters(cfnStackParams)
-			.withTags(cfnStackTags);
+			.withTags(cfnStackTags)
+			.withRoleARN(cfnRoleArn);
 		
 		// If template URL is specified, then use it
 		if (Strings.isNullOrEmpty(cfnTemplateUrl) == false) {
diff --git a/src/main/java/jp/classmethod/aws/gradle/cloudformation/AmazonCloudFormationPlugin.java b/src/main/java/jp/classmethod/aws/gradle/cloudformation/AmazonCloudFormationPlugin.java
@@ -96,6 +96,7 @@ private void applyTasks(Project project) { // NOPMD
 						.withKey(it.getKey().toString())
 						.withValue(it.getValue().toString()))
 					.collect(Collectors.toList()));
+				task.conventionMapping("cfnRoleArn", () -> cfnExt.getCfnRoleArn());
 				task.conventionMapping("cfnTemplateUrl", () -> cfnExt.getTemplateURL());
 				task.conventionMapping("cfnTemplateFile", () -> cfnExt.getTemplateFile());
 				task.conventionMapping("cfnStackPolicyUrl", () -> cfnExt.getStackPolicyURL());
