Skip to content

armgit / floci

Public Imported from GitHub
0

Light, fluffy, and always free - The AWS Local Emulator alternative

fix(codedeploy): default server hook timeout to one hour (#3606)

BingEdward73ef15f6e266
diff --git a/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java b/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java
index 2655d7a696..26c5e04211 100644
--- a/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployService.java
@@ -915,7 +915,7 @@ public class CodeDeployService {
Map<String, Object> event) throws InterruptedException {
for (Map<String, Object> step : hookSteps) {
String location = (String) step.get("location");
- int timeout = toInt(step.get("timeout"), 300);
+ int timeout = toInt(step.get("timeout"), 3600);
String runas = (String) step.getOrDefault("runas", "root");
if (location == null) {
@@ -994,7 +994,14 @@ public class CodeDeployService {
steps.forEach(s -> {
Map<String, Object> step = new java.util.LinkedHashMap<>();
if (s.has("location")) { step.put("location", s.get("location").asText()); }
- if (s.has("timeout")) { step.put("timeout", s.get("timeout").asInt(300)); }
+ if (s.hasNonNull("timeout")) {
+ JsonNode value = s.get("timeout");
+ int timeout = value.asInt(0);
+ if ((!value.isNumber() && !value.isTextual()) || timeout <= 0) {
+ throw new IllegalArgumentException("Invalid script timeout");
+ }
+ step.put("timeout", timeout);
+ }
if (s.has("runas")) { step.put("runas", s.get("runas").asText("root")); }
stepList.add(step);
});
diff --git a/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployHookTimeoutTest.java b/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployHookTimeoutTest.java
new file mode 100644
index 0000000000..db0323b1df
--- /dev/null
+++ b/src/test/java/io/github/hectorvent/floci/services/codedeploy/CodeDeployHookTimeoutTest.java
@@ -0,0 +1,92 @@
+package io.github.hectorvent.floci.services.codedeploy;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.github.hectorvent.floci.core.common.AwsException;
+import io.github.hectorvent.floci.core.common.RegionResolver;
+import io.github.hectorvent.floci.services.ec2.Ec2Service;
+import io.github.hectorvent.floci.services.ecs.EcsService;
+import io.github.hectorvent.floci.services.elbv2.ElbV2Service;
+import io.github.hectorvent.floci.services.lambda.LambdaService;
+import io.github.hectorvent.floci.services.ssm.SsmCommandService;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import java.util.Map;
+import java.util.stream.Stream;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.ArgumentMatchers.anyMap;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+class CodeDeployHookTimeoutTest {
+
+ @ParameterizedTest
+ @MethodSource("serverTimeouts")
+ void serverHookUsesAppSpecTimeoutOrOneHourDefault(String timeoutLine, int expectedTimeout) {
+ String region = "us-east-1";
+ SsmCommandService ssm = mock(SsmCommandService.class);
+ when(ssm.isInstanceRegistered("onprem", region)).thenReturn(true);
+ when(ssm.sendCommandToInstance(eq("onprem"), eq("AWS-RunShellScript"),
+ anyMap(), eq(expectedTimeout), eq(region))).thenReturn("command");
+ when(ssm.getCommandInvocationStatus("command", "onprem", region)).thenReturn("Success");
+
+ CodeDeployService service = serverService(ssm, region);
+ service.registerOnPremisesInstance(region, "onprem", null, null);
+
+ service.createDeployment(region, "app", "group", null,
+ Map.of("appSpecContent", Map.of("content", """
+ os: linux
+ hooks:
+ ApplicationStart:
+ - location: scripts/start.sh
+ %s
+ """.formatted(timeoutLine))), null);
+
+ verify(ssm, timeout(3000)).sendCommandToInstance(eq("onprem"),
+ eq("AWS-RunShellScript"), anyMap(), eq(expectedTimeout), eq(region));
+ }
+
+ static Stream<Arguments> serverTimeouts() {
+ return Stream.of(
+ Arguments.of("", 3600),
+ Arguments.of("timeout: 900", 900),
+ Arguments.of("timeout: \"900\"", 900),
+ Arguments.of("timeout:", 3600),
+ Arguments.of("timeout: ~", 3600));
+ }
+
+ @ParameterizedTest
+ @ValueSource(strings = {"abc", "0", "-1", "true"})
+ void serverHookRejectsInvalidTimeout(String timeoutValue) {
+ String region = "us-east-1";
+ CodeDeployService service = serverService(mock(SsmCommandService.class), region);
+
+ AwsException error = assertThrows(AwsException.class, () -> service.createDeployment(
+ region, "app", "group", null,
+ Map.of("appSpecContent", Map.of("content", """
+ os: linux
+ hooks:
+ ApplicationStart:
+ - location: scripts/start.sh
+ timeout: %s
+ """.formatted(timeoutValue))), null));
+ assertEquals("InvalidRevisionException", error.getErrorCode());
+ }
+
+ private CodeDeployService serverService(SsmCommandService ssm, String region) {
+ CodeDeployService service = new CodeDeployService(
+ mock(LambdaService.class), mock(EcsService.class), mock(ElbV2Service.class),
+ ssm, mock(Ec2Service.class), new ObjectMapper(),
+ new RegionResolver(region, "000000000000"), null);
+ service.createApplication(region, "app", "Server", null);
+ service.createDeploymentGroup(region, "app", "group", null, "role", null);
+ return service;
+ }
+}