Skip to content

armgit / floci

Public Imported from GitHub
0

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

fix(codepipeline): handle legacy pipelines without versions (#3677)

XuJian374b80eb6584
diff --git a/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java b/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java
index ef4887f9fd..e1a4ad5034 100644
--- a/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java
+++ b/src/main/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineService.java
@@ -381,8 +381,9 @@ public class CodePipelineService {
private ObjectNode getPipelineResponse(JsonNode request, String region, String account) {
CodePipelinePipeline pipeline = requirePipeline(account, region, text(request, "name"));
- int version = request.path("version").asInt(pipeline.getVersion());
- if (version != pipeline.getVersion()) {
+ int currentVersion = pipeline.getVersion() == null ? 1 : pipeline.getVersion();
+ int version = request.path("version").asInt(currentVersion);
+ if (version != currentVersion) {
throw new AwsException("PipelineVersionNotFoundException",
"Pipeline version not found: " + version, 400);
}
diff --git a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineServiceTest.java b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineServiceTest.java
index 70e94919d1..3cf3fa8722 100644
--- a/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineServiceTest.java
+++ b/src/test/java/io/github/hectorvent/floci/services/codepipeline/CodePipelineServiceTest.java
@@ -8,6 +8,7 @@ import io.github.hectorvent.floci.core.storage.AccountAwareStorageBackend;
import io.github.hectorvent.floci.core.storage.StorageFactory;
import io.github.hectorvent.floci.services.codebuild.CodeBuildService;
import io.github.hectorvent.floci.services.codedeploy.CodeDeployService;
+import io.github.hectorvent.floci.services.codepipeline.model.CodePipelinePipeline;
import io.github.hectorvent.floci.services.lambda.LambdaService;
import io.github.hectorvent.floci.services.s3.S3Service;
import io.github.hectorvent.floci.services.s3.model.S3Object;
@@ -40,6 +41,50 @@ class CodePipelineServiceTest {
mock(LambdaService.class),
mock(S3Service.class));
+ @Test
+ void getPipelineTreatsMissingStoredVersionAsVersionOne() throws Exception {
+ CapturingStorageFactory storageFactory = new CapturingStorageFactory();
+ CodePipelineService legacyService = new CodePipelineService(
+ storageFactory,
+ mapper,
+ mock(CodeBuildService.class),
+ mock(CodeDeployService.class),
+ mock(LambdaService.class),
+ mock(S3Service.class));
+ CodePipelinePipeline pipeline = mapper.readValue("""
+ {
+ "accountId": "000000000000",
+ "region": "us-east-1",
+ "name": "legacy-pipeline",
+ "arn": "arn:aws:codepipeline:us-east-1:000000000000:legacy-pipeline",
+ "created": 1.0,
+ "updated": 1.0,
+ "declaration": {
+ "name": "legacy-pipeline",
+ "version": 1
+ }
+ }
+ """, CodePipelinePipeline.class);
+ storageFactory.pipelineStore().putForAccount(ACCOUNT, REGION + ":legacy-pipeline", pipeline);
+
+ try {
+ JsonNode current = legacyService.handle(
+ "GetPipeline", mapper.readTree("{\"name\":\"legacy-pipeline\"}"), REGION, ACCOUNT);
+ JsonNode explicitVersion = legacyService.handle(
+ "GetPipeline", mapper.readTree("{\"name\":\"legacy-pipeline\",\"version\":1}"), REGION, ACCOUNT);
+
+ assertEquals(1, current.path("pipeline").path("version").asInt());
+ assertEquals(1, explicitVersion.path("pipeline").path("version").asInt());
+ AwsException missing = assertThrows(AwsException.class,
+ () -> legacyService.handle(
+ "GetPipeline", mapper.readTree("{\"name\":\"legacy-pipeline\",\"version\":2}"),
+ REGION, ACCOUNT));
+ assertEquals("PipelineVersionNotFoundException", missing.getErrorCode());
+ } finally {
+ legacyService.shutdown();
+ }
+ }
+
@Test
void sourcePollingAndPipelineUpdateSerializeBaselineChanges() throws Exception {
S3Service s3Service = mock(S3Service.class);
@@ -187,4 +232,27 @@ class CodePipelineServiceTest {
return AccountAwareStorageBackend.inMemory(ACCOUNT);
}
}
+
+ private static final class CapturingStorageFactory extends StorageFactory {
+ private AccountAwareStorageBackend<CodePipelinePipeline> pipelineStore;
+
+ private CapturingStorageFactory() {
+ super(null, null);
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public <V> AccountAwareStorageBackend<V> create(String serviceName, String fileName,
+ TypeReference<Map<String, V>> typeReference) {
+ AccountAwareStorageBackend<V> store = AccountAwareStorageBackend.inMemory(ACCOUNT);
+ if ("codepipeline-pipelines.json".equals(fileName)) {
+ pipelineStore = (AccountAwareStorageBackend<CodePipelinePipeline>) (AccountAwareStorageBackend<?>) store;
+ }
+ return store;
+ }
+
+ private AccountAwareStorageBackend<CodePipelinePipeline> pipelineStore() {
+ return pipelineStore;
+ }
+ }
}