From 11d098bcd70518fc1bcbc7be1174df5ca8a6bf87 Mon Sep 17 00:00:00 2001 From: WusatSami03 Date: Thu, 12 Nov 2026 16:32:40 +0530 Subject: [PATCH 1/3] Init message queue integration for async pipeline execution --- docker-compose.yml | 18 ++++- flags/feature-flags.json | 8 +++ pipeline/pom.xml | 5 ++ .../pipeline/configuration/FeatureFlag.java | 3 +- .../configuration/MessagingConfig.java | 22 +++++++ .../PipelineBuildMessageConsumer.java | 45 +++++++++++++ .../PipelineBuildMessagePublisher.java | 34 ++++++++++ .../repository/PipelineBuildRepository.java | 16 ++++- .../service/PipelineExecutorService.java | 15 ++++- .../src/main/resources/application-demo.yaml | 6 ++ .../src/main/resources/application-test.yaml | 1 + .../PipelineBuildMessageConsumerTest.java | 66 +++++++++++++++++++ 12 files changed, 234 insertions(+), 5 deletions(-) create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java create mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java diff --git a/docker-compose.yml b/docker-compose.yml index fdc4bd1a..7d251518 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,6 +67,19 @@ services: - "8016:8016" networks: - app + rabbitmq: + image: rabbitmq:3-management + container_name: rabbitmq + ports: + - "5672:5672" + - "15672:15672" + networks: + - app + healthcheck: + test: ["CMD", "rabbitmq-diagnostics", "ping"] + interval: 10s + timeout: 5s + retries: 5 pipeline-app: image: pipeline-app container_name: pipeline-app @@ -79,6 +92,7 @@ services: AUTH_PORT: 8080 OTEL_SERVICE_NAME: pipeline-app FEATURE_PROVIDER_URI: http://flagd:8016 + RABBITMQ_HOST: rabbitmq ports: - "8080:8080" volumes: @@ -92,4 +106,6 @@ services: auth-service: condition: service_healthy flagd: - condition: service_started \ No newline at end of file + condition: service_started + rabbitmq: + condition: service_healthy \ No newline at end of file diff --git a/flags/feature-flags.json b/flags/feature-flags.json index 554b7bc7..0400e06b 100644 --- a/flags/feature-flags.json +++ b/flags/feature-flags.json @@ -8,6 +8,14 @@ "off": false }, "defaultVariant": "off" + }, + "ENABLE_MESSAGE_QUEUE": { + "state": "ENABLED", + "variants": { + "on": true, + "off": false + }, + "defaultVariant": "off" } } } diff --git a/pipeline/pom.xml b/pipeline/pom.xml index efc9ba78..927521fd 100644 --- a/pipeline/pom.xml +++ b/pipeline/pom.xml @@ -150,6 +150,11 @@ 0.0.2 + + org.springframework.boot + spring-boot-starter-amqp + + diff --git a/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java b/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java index 61fdca40..3de147aa 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java @@ -2,7 +2,8 @@ /** Enum of all feature flag keys used in this application. */ public enum FeatureFlag { - ENABLE_EDIT_PIPELINE("ENABLE_EDIT_PIPELINE"); + ENABLE_EDIT_PIPELINE("ENABLE_EDIT_PIPELINE"), + ENABLE_MESSAGE_QUEUE("ENABLE_MESSAGE_QUEUE"); private final String key; diff --git a/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java new file mode 100644 index 00000000..9426ef4e --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java @@ -0,0 +1,22 @@ +package com.autobuild.pipeline.configuration; + +import org.springframework.amqp.core.Queue; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * RabbitMQ messaging configuration. + * + * @author Suvabrata Chowdhury + */ +@Configuration +public class MessagingConfig { + + /** Name of the queue used to dispatch pipeline build execution requests. */ + public static final String PIPELINE_BUILD_QUEUE = "pipeline-build-queue"; + + @Bean + public Queue pipelineBuildQueue() { + return new Queue(PIPELINE_BUILD_QUEUE, true); + } +} diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java new file mode 100644 index 00000000..926291cd --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java @@ -0,0 +1,45 @@ +package com.autobuild.pipeline.executor.messaging; + +import java.util.UUID; + +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.autobuild.pipeline.configuration.MessagingConfig; +import com.autobuild.pipeline.executor.entity.PipelineBuild; +import com.autobuild.pipeline.executor.job.PipelineExecutor; +import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; + +import jakarta.persistence.EntityNotFoundException; +import lombok.extern.slf4j.Slf4j; + +/** + * Consumes pipeline build messages from the queue and triggers execution. + * + * @author Suvabrata Chowdhury + */ +@Slf4j +@Service +public class PipelineBuildMessageConsumer { + + @Autowired + private PipelineBuildRepository buildRepository; + + @Autowired + private PipelineExecutor pipelineExecutor; + + /** + * Receives a build ID string from the queue, loads the build, and executes it. + * + * @param buildId UUID string of the {@code PipelineBuild} to execute + */ + @RabbitListener(queues = MessagingConfig.PIPELINE_BUILD_QUEUE) + public void consume(String buildId) { + UUID id = UUID.fromString(buildId); + PipelineBuild build = buildRepository.findByIdWithStageBuilds(id) + .orElseThrow(() -> new EntityNotFoundException("PipelineBuild not found: " + id)); + log.info("Consuming build {} from queue", id); + pipelineExecutor.executePipeline(build); + } +} \ No newline at end of file diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java new file mode 100644 index 00000000..3f3a3a03 --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java @@ -0,0 +1,34 @@ +package com.autobuild.pipeline.executor.messaging; + +import java.util.UUID; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.autobuild.pipeline.configuration.MessagingConfig; + +import lombok.extern.slf4j.Slf4j; + +/** + * Publishes pipeline build IDs to the message queue for async execution. + * + * @author Suvabrata Chowdhury + */ +@Slf4j +@Service +public class PipelineBuildMessagePublisher { + + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * Sends a pipeline build ID to the queue. + * + * @param buildId the ID of the saved {@code PipelineBuild} to execute + */ + public void publish(UUID buildId) { + rabbitTemplate.convertAndSend(MessagingConfig.PIPELINE_BUILD_QUEUE, buildId.toString()); + log.info("Published build {} to queue '{}'", buildId, MessagingConfig.PIPELINE_BUILD_QUEUE); + } +} diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java index 00741a86..05414325 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java @@ -1,19 +1,31 @@ package com.autobuild.pipeline.executor.repository; +import java.util.Optional; import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.autobuild.pipeline.executor.entity.PipelineBuild; /** * Repository layer for PipelineBuild. - * + * * @author Suvabrata Chowdhury */ @Repository -public interface PipelineBuildRepository extends JpaRepository{ +public interface PipelineBuildRepository extends JpaRepository { + /** + * Finds a pipeline build by ID with stage builds eagerly fetched. + * + * @param id the pipeline build UUID + * @return an Optional containing the build with stage builds loaded + */ + @Query("SELECT pb FROM PipelineBuild pb JOIN FETCH pb.stageBuilds WHERE pb.id = :id") + Optional findByIdWithStageBuilds(@Param("id") UUID id); } + diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java index 53dcbac3..085eaf14 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java @@ -11,6 +11,8 @@ import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationManager; +import com.autobuild.pipeline.configuration.FeatureFlag; +import com.autobuild.pipeline.configuration.FeatureFlagService; import com.autobuild.pipeline.definiton.entity.Pipeline; import com.autobuild.pipeline.definiton.repository.PipelineRepository; import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; @@ -20,6 +22,7 @@ import com.autobuild.pipeline.executor.entity.StageBuild; import com.autobuild.pipeline.executor.job.PipelineExecutor; import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; +import com.autobuild.pipeline.executor.messaging.PipelineBuildMessagePublisher; import com.autobuild.pipeline.utility.file.PipelineFileService; import jakarta.persistence.EntityNotFoundException; @@ -52,6 +55,12 @@ public class PipelineExecutorService { @Autowired private PipelineFileService pipelineFileService; + @Autowired + private FeatureFlagService featureFlagService; + + @Autowired + private PipelineBuildMessagePublisher messagePublisher; + @Transactional public PipelineBuildDTO executePipeline(PipelineExecuteRequest pipelineRequest) throws IOException { UUID pipelineId = pipelineRequest.getPipelineId(); @@ -73,7 +82,11 @@ public PipelineBuildDTO executePipeline(PipelineExecuteRequest pipelineRequest) TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override public void afterCommit() { - pipelineExecutor.executePipeline(savedBuild); + if (featureFlagService.getBooleanValue(FeatureFlag.ENABLE_MESSAGE_QUEUE.getKey())) { + messagePublisher.publish(savedBuild.getId()); + } else { + pipelineExecutor.executePipeline(savedBuild); + } } }); diff --git a/pipeline/src/main/resources/application-demo.yaml b/pipeline/src/main/resources/application-demo.yaml index bb4b83d0..8cf29e02 100644 --- a/pipeline/src/main/resources/application-demo.yaml +++ b/pipeline/src/main/resources/application-demo.yaml @@ -29,6 +29,12 @@ spring: exclude: - org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration + rabbitmq: + host: ${RABBITMQ_HOST:localhost} + port: ${RABBITMQ_PORT:5672} + username: ${RABBITMQ_USERNAME:guest} + password: ${RABBITMQ_PASSWORD:guest} + feature-flags: provider: uri: ${FEATURE_PROVIDER_URI:} diff --git a/pipeline/src/main/resources/application-test.yaml b/pipeline/src/main/resources/application-test.yaml index 89a9863a..105b869a 100644 --- a/pipeline/src/main/resources/application-test.yaml +++ b/pipeline/src/main/resources/application-test.yaml @@ -22,6 +22,7 @@ spring: exclude: - org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration - org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration + - org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration feature-flags: provider: diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java new file mode 100644 index 00000000..ad4a59bd --- /dev/null +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java @@ -0,0 +1,66 @@ +package com.autobuild.pipeline.executor.messaging; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Optional; +import java.util.UUID; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import com.autobuild.pipeline.executor.entity.PipelineBuild; +import com.autobuild.pipeline.executor.job.PipelineExecutor; +import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; +import com.autobuild.pipeline.testutility.DummyData; + +import jakarta.persistence.EntityNotFoundException; + +/** + * Unit tests for {@link PipelineBuildMessageConsumer}. + * + * @author Suvabrata Chowdhury + */ +public class PipelineBuildMessageConsumerTest { + + @Mock + private PipelineBuildRepository buildRepository; + + @Mock + private PipelineExecutor pipelineExecutor; + + @InjectMocks + private PipelineBuildMessageConsumer consumer; + + @BeforeEach + public void setup() { + MockitoAnnotations.openMocks(this); + } + + @Test + public void consume_whenBuildExists_executesIt() { + UUID pipelineId = UUID.randomUUID(); + PipelineBuild build = DummyData.getPipelineBuild(pipelineId); + + when(buildRepository.findByIdWithStageBuilds(build.getId())).thenReturn(Optional.of(build)); + + consumer.consume(build.getId().toString()); + + verify(pipelineExecutor, times(1)).executePipeline(eq(build)); + } + + @Test + public void consume_whenBuildNotFound_throwsEntityNotFoundException() { + UUID buildId = UUID.randomUUID(); + + when(buildRepository.findByIdWithStageBuilds(buildId)).thenReturn(Optional.empty()); + + assertThrows(EntityNotFoundException.class, () -> consumer.consume(buildId.toString())); + } +} \ No newline at end of file From 94c33fc2614b36d3d720d0f0ca468fd50cf366e9 Mon Sep 17 00:00:00 2001 From: WusatSami03 Date: Fri, 13 Nov 2026 00:00:17 +0530 Subject: [PATCH 2/3] review comments --- docker-compose.yml | 2 +- flags/feature-flags.json | 2 +- .../pipeline/configuration/FeatureFlag.java | 2 +- .../configuration/MessagingConfig.java | 23 +++- .../PipelineExecutorController.java | 18 ++- .../PipelineBuildRequestMessage.java | 25 ++++ .../dto/messaging/StageDefinition.java | 21 ++++ .../PipelineBuildMessageConsumer.java | 45 -------- .../PipelineBuildMessagePublisher.java | 30 +---- ...RabbitMqPipelineBuildMessagePublisher.java | 28 +++++ .../repository/PipelineBuildRepository.java | 16 +-- .../service/PipelineExecutorService.java | 108 ++++++------------ .../src/main/resources/application-demo.yaml | 5 +- .../PipelineExecutorControllerTest.java | 39 +++---- .../PipelineBuildMessageConsumerTest.java | 66 ----------- .../service/PipelineExecutorServiceTest.java | 81 +++++++------ .../pipeline/testutility/DummyData.java | 7 ++ 17 files changed, 217 insertions(+), 301 deletions(-) create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/PipelineBuildRequestMessage.java create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/StageDefinition.java delete mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java create mode 100644 pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/RabbitMqPipelineBuildMessagePublisher.java delete mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java diff --git a/docker-compose.yml b/docker-compose.yml index 7d251518..0dd98ccb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -92,7 +92,7 @@ services: AUTH_PORT: 8080 OTEL_SERVICE_NAME: pipeline-app FEATURE_PROVIDER_URI: http://flagd:8016 - RABBITMQ_HOST: rabbitmq + RABBITMQ_URL: amqp://guest:guest@rabbitmq:5672 ports: - "8080:8080" volumes: diff --git a/flags/feature-flags.json b/flags/feature-flags.json index 0400e06b..0a9ba902 100644 --- a/flags/feature-flags.json +++ b/flags/feature-flags.json @@ -9,7 +9,7 @@ }, "defaultVariant": "off" }, - "ENABLE_MESSAGE_QUEUE": { + "ENABLE_NEW_ARCHITECTURE": { "state": "ENABLED", "variants": { "on": true, diff --git a/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java b/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java index 3de147aa..a258ed4f 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/configuration/FeatureFlag.java @@ -3,7 +3,7 @@ /** Enum of all feature flag keys used in this application. */ public enum FeatureFlag { ENABLE_EDIT_PIPELINE("ENABLE_EDIT_PIPELINE"), - ENABLE_MESSAGE_QUEUE("ENABLE_MESSAGE_QUEUE"); + ENABLE_NEW_ARCHITECTURE("ENABLE_NEW_ARCHITECTURE"); private final String key; diff --git a/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java index 9426ef4e..0c11a454 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MessagingConfig.java @@ -1,22 +1,35 @@ package com.autobuild.pipeline.configuration; import org.springframework.amqp.core.Queue; +import org.springframework.amqp.rabbit.connection.ConnectionFactory; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * RabbitMQ messaging configuration. - * - * @author Suvabrata Chowdhury + * Message queue configuration. */ @Configuration public class MessagingConfig { /** Name of the queue used to dispatch pipeline build execution requests. */ - public static final String PIPELINE_BUILD_QUEUE = "pipeline-build-queue"; + public static final String PIPELINE_BUILD_REQUEST_QUEUE = "pipeline-build-request-queue"; @Bean public Queue pipelineBuildQueue() { - return new Queue(PIPELINE_BUILD_QUEUE, true); + return new Queue(PIPELINE_BUILD_REQUEST_QUEUE, true); + } + + @Bean + public Jackson2JsonMessageConverter messageConverter() { + return new Jackson2JsonMessageConverter(); + } + + @Bean + public RabbitTemplate rabbitTemplate(ConnectionFactory connectionFactory) { + RabbitTemplate template = new RabbitTemplate(connectionFactory); + template.setMessageConverter(messageConverter()); + return template; } } diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/controller/PipelineExecutorController.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/controller/PipelineExecutorController.java index a02140f4..c4f91122 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/controller/PipelineExecutorController.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/controller/PipelineExecutorController.java @@ -1,16 +1,16 @@ package com.autobuild.pipeline.executor.controller; -import java.io.IOException; +import java.util.Map; +import java.util.UUID; -import org.springframework.http.MediaType; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; import com.autobuild.pipeline.executor.dto.PipelineExecuteRequest; import com.autobuild.pipeline.executor.service.PipelineExecutorService; @@ -24,8 +24,6 @@ /** * Controller for executing a pipeline. - * - * @author Suvabrata Chowdhury */ @Tag(name = "Pipeline") @SecurityScheme( @@ -43,12 +41,10 @@ public class PipelineExecutorController { @Autowired private PipelineExecutorService service; - @Operation(summary = "Execute a pipeline", responses = @ApiResponse(responseCode = "203")) + @Operation(summary = "Execute a pipeline", responses = @ApiResponse(responseCode = "202")) @PostMapping(value = "/pipeline", produces = MediaType.APPLICATION_JSON_VALUE) - public ResponseEntity executePipeline(@RequestBody @Valid PipelineExecuteRequest request) - throws IOException { - PipelineBuildDTO build = service.executePipeline(request); - - return ResponseEntity.accepted().body(build); + public ResponseEntity> executePipeline(@RequestBody @Valid PipelineExecuteRequest request) { + UUID buildId = service.executePipeline(request); + return ResponseEntity.accepted().body(Map.of("buildId", buildId)); } } \ No newline at end of file diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/PipelineBuildRequestMessage.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/PipelineBuildRequestMessage.java new file mode 100644 index 00000000..08766d11 --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/PipelineBuildRequestMessage.java @@ -0,0 +1,25 @@ +package com.autobuild.pipeline.executor.dto.messaging; + +import java.util.List; +import java.util.UUID; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * Message payload published to the queue when a pipeline execution is requested. + * Contains the pipeline's definition so the executor can process it independently. + */ +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +public class PipelineBuildRequestMessage { + + private UUID buildId; + private UUID pipelineId; + private String pipelineName; + private List stages; +} diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/StageDefinition.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/StageDefinition.java new file mode 100644 index 00000000..7e43ef25 --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/messaging/StageDefinition.java @@ -0,0 +1,21 @@ +package com.autobuild.pipeline.executor.dto.messaging; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +/** + * Represents a single stage within a pipeline build request message. + */ +@NoArgsConstructor +@AllArgsConstructor +@Getter +@Setter +public class StageDefinition { + + private String name; + private String scriptType; + private String command; + private int stageOrder; +} diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java deleted file mode 100644 index 926291cd..00000000 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumer.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.autobuild.pipeline.executor.messaging; - -import java.util.UUID; - -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.autobuild.pipeline.configuration.MessagingConfig; -import com.autobuild.pipeline.executor.entity.PipelineBuild; -import com.autobuild.pipeline.executor.job.PipelineExecutor; -import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; - -import jakarta.persistence.EntityNotFoundException; -import lombok.extern.slf4j.Slf4j; - -/** - * Consumes pipeline build messages from the queue and triggers execution. - * - * @author Suvabrata Chowdhury - */ -@Slf4j -@Service -public class PipelineBuildMessageConsumer { - - @Autowired - private PipelineBuildRepository buildRepository; - - @Autowired - private PipelineExecutor pipelineExecutor; - - /** - * Receives a build ID string from the queue, loads the build, and executes it. - * - * @param buildId UUID string of the {@code PipelineBuild} to execute - */ - @RabbitListener(queues = MessagingConfig.PIPELINE_BUILD_QUEUE) - public void consume(String buildId) { - UUID id = UUID.fromString(buildId); - PipelineBuild build = buildRepository.findByIdWithStageBuilds(id) - .orElseThrow(() -> new EntityNotFoundException("PipelineBuild not found: " + id)); - log.info("Consuming build {} from queue", id); - pipelineExecutor.executePipeline(build); - } -} \ No newline at end of file diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java index 3f3a3a03..c745963a 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessagePublisher.java @@ -1,34 +1,16 @@ package com.autobuild.pipeline.executor.messaging; -import java.util.UUID; - -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.autobuild.pipeline.configuration.MessagingConfig; - -import lombok.extern.slf4j.Slf4j; +import com.autobuild.pipeline.executor.dto.messaging.PipelineBuildRequestMessage; /** - * Publishes pipeline build IDs to the message queue for async execution. - * - * @author Suvabrata Chowdhury + * Contract for publishing pipeline build request messages to a message queue. */ -@Slf4j -@Service -public class PipelineBuildMessagePublisher { - - @Autowired - private RabbitTemplate rabbitTemplate; +public interface PipelineBuildMessagePublisher { /** - * Sends a pipeline build ID to the queue. + * Publishes a pipeline build request message. * - * @param buildId the ID of the saved {@code PipelineBuild} to execute + * @param message the build request containing the pipeline definition and generated build ID */ - public void publish(UUID buildId) { - rabbitTemplate.convertAndSend(MessagingConfig.PIPELINE_BUILD_QUEUE, buildId.toString()); - log.info("Published build {} to queue '{}'", buildId, MessagingConfig.PIPELINE_BUILD_QUEUE); - } + void publish(PipelineBuildRequestMessage message); } diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/RabbitMqPipelineBuildMessagePublisher.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/RabbitMqPipelineBuildMessagePublisher.java new file mode 100644 index 00000000..156b367f --- /dev/null +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/messaging/RabbitMqPipelineBuildMessagePublisher.java @@ -0,0 +1,28 @@ +package com.autobuild.pipeline.executor.messaging; + +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import com.autobuild.pipeline.configuration.MessagingConfig; +import com.autobuild.pipeline.executor.dto.messaging.PipelineBuildRequestMessage; + +import lombok.extern.slf4j.Slf4j; + +/** + * RabbitMQ implementation of {@link PipelineBuildMessagePublisher}. + */ +@Slf4j +@Service +public class RabbitMqPipelineBuildMessagePublisher implements PipelineBuildMessagePublisher { + + @Autowired + private RabbitTemplate rabbitTemplate; + + @Override + public void publish(PipelineBuildRequestMessage message) { + rabbitTemplate.convertAndSend(MessagingConfig.PIPELINE_BUILD_REQUEST_QUEUE, message); + log.info("Published build request {} to queue '{}'", + message.getBuildId(), MessagingConfig.PIPELINE_BUILD_REQUEST_QUEUE); + } +} diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java index 05414325..e8fd955b 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/repository/PipelineBuildRepository.java @@ -1,31 +1,17 @@ package com.autobuild.pipeline.executor.repository; -import java.util.Optional; import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.autobuild.pipeline.executor.entity.PipelineBuild; /** * Repository layer for PipelineBuild. - * - * @author Suvabrata Chowdhury */ @Repository -public interface PipelineBuildRepository extends JpaRepository { +public interface PipelineBuildRepository extends JpaRepository{ - /** - * Finds a pipeline build by ID with stage builds eagerly fetched. - * - * @param id the pipeline build UUID - * @return an Optional containing the build with stage builds loaded - */ - @Query("SELECT pb FROM PipelineBuild pb JOIN FETCH pb.stageBuilds WHERE pb.id = :id") - Optional findByIdWithStageBuilds(@Param("id") UUID id); } - diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java index 085eaf14..e4836d85 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/service/PipelineExecutorService.java @@ -1,41 +1,28 @@ package com.autobuild.pipeline.executor.service; -import java.io.IOException; import java.util.List; import java.util.Optional; import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.support.TransactionSynchronization; -import org.springframework.transaction.support.TransactionSynchronizationManager; import com.autobuild.pipeline.configuration.FeatureFlag; import com.autobuild.pipeline.configuration.FeatureFlagService; import com.autobuild.pipeline.definiton.entity.Pipeline; import com.autobuild.pipeline.definiton.repository.PipelineRepository; -import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; import com.autobuild.pipeline.executor.dto.PipelineExecuteRequest; -import com.autobuild.pipeline.executor.dto.mapper.PipelineBuildMapper; -import com.autobuild.pipeline.executor.entity.PipelineBuild; -import com.autobuild.pipeline.executor.entity.StageBuild; +import com.autobuild.pipeline.executor.dto.messaging.PipelineBuildRequestMessage; +import com.autobuild.pipeline.executor.dto.messaging.StageDefinition; import com.autobuild.pipeline.executor.job.PipelineExecutor; -import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; import com.autobuild.pipeline.executor.messaging.PipelineBuildMessagePublisher; -import com.autobuild.pipeline.utility.file.PipelineFileService; import jakarta.persistence.EntityNotFoundException; import lombok.extern.slf4j.Slf4j; /** - * Service layer for executing a pipeline. - * - * @author Suvabrata Chowdhury + * Service layer for triggering pipeline execution. */ - -//TODO: too much dependencies. refactor - @Slf4j @Service public class PipelineExecutorService { @@ -43,26 +30,24 @@ public class PipelineExecutorService { @Autowired private PipelineRepository pipelineRepository; - @Autowired - private PipelineBuildRepository buildRepository; - - @Autowired - private PipelineExecutor pipelineExecutor; - - @Autowired - private PipelineBuildMapper mapper; - - @Autowired - private PipelineFileService pipelineFileService; - @Autowired private FeatureFlagService featureFlagService; @Autowired private PipelineBuildMessagePublisher messagePublisher; - @Transactional - public PipelineBuildDTO executePipeline(PipelineExecuteRequest pipelineRequest) throws IOException { + @Autowired + private PipelineExecutor pipelineExecutor; + + /** + * Triggers execution of a pipeline. + * When the message queue flag is enabled, publishes the pipeline definition to the queue. + * Otherwise falls back to direct execution. + * + * @param pipelineRequest the execution request containing the pipeline ID + * @return the generated build ID + */ + public UUID executePipeline(PipelineExecuteRequest pipelineRequest) { UUID pipelineId = pipelineRequest.getPipelineId(); Optional optionalPipeline = pipelineRepository.findById(pipelineId); @@ -72,51 +57,28 @@ public PipelineBuildDTO executePipeline(PipelineExecuteRequest pipelineRequest) } Pipeline pipeline = optionalPipeline.get(); - PipelineBuild pipelineBuild = createBuild(pipeline); - - createEmptyLogFiles(pipelineBuild); + UUID buildId = UUID.randomUUID(); - PipelineBuild savedBuild = buildRepository.save(pipelineBuild); - - // Strictly run executing pipeline after build is commited - TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { - @Override - public void afterCommit() { - if (featureFlagService.getBooleanValue(FeatureFlag.ENABLE_MESSAGE_QUEUE.getKey())) { - messagePublisher.publish(savedBuild.getId()); - } else { - pipelineExecutor.executePipeline(savedBuild); - } - } - }); - - return mapper.entityToDto(savedBuild); - } - - private void createEmptyLogFiles(PipelineBuild pipelineBuild) throws IOException { - for (StageBuild stageBuild : pipelineBuild.getStageBuilds()) { - try { - stageBuild.setLogPath(pipelineFileService.createLogFile(pipelineBuild.getId(), stageBuild.getId())); - } catch (IOException e) { - pipelineFileService.removeLogFiles(pipelineBuild); - } + if (featureFlagService.getBooleanValue(FeatureFlag.ENABLE_NEW_ARCHITECTURE.getKey())) { + PipelineBuildRequestMessage message = buildMessage(buildId, pipeline); + messagePublisher.publish(message); + } else { + pipelineExecutor.executePipeline(null); } - } - - // TODO: abstract this logic - private PipelineBuild createBuild(final Pipeline pipeline) { - List stageBuilds = pipeline.getStages() - .stream() - .map(stage -> { - StageBuild stageBuild = new StageBuild(stage); - stageBuild.setId(UUID.randomUUID()); - return stageBuild; - }).toList(); - - PipelineBuild pipelineBuild = new PipelineBuild(pipeline, stageBuilds); - pipelineBuild.setId(UUID.randomUUID()); + return buildId; + } - return pipelineBuild; + private PipelineBuildRequestMessage buildMessage(UUID buildId, Pipeline pipeline) { + List stages = pipeline.getStages() + .stream() + .map(stage -> new StageDefinition( + stage.getName(), + stage.getScriptType(), + stage.getPath(), + stage.getStageOrder())) + .toList(); + + return new PipelineBuildRequestMessage(buildId, pipeline.getId(), pipeline.getName(), stages); } -} \ No newline at end of file +} diff --git a/pipeline/src/main/resources/application-demo.yaml b/pipeline/src/main/resources/application-demo.yaml index 8cf29e02..a33eb416 100644 --- a/pipeline/src/main/resources/application-demo.yaml +++ b/pipeline/src/main/resources/application-demo.yaml @@ -30,10 +30,7 @@ spring: - org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration rabbitmq: - host: ${RABBITMQ_HOST:localhost} - port: ${RABBITMQ_PORT:5672} - username: ${RABBITMQ_USERNAME:guest} - password: ${RABBITMQ_PASSWORD:guest} + addresses: ${RABBITMQ_URL:amqp://guest:guest@localhost:5672} feature-flags: provider: diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineExecutorControllerTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineExecutorControllerTest.java index 100339b4..5b8b3a69 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineExecutorControllerTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineExecutorControllerTest.java @@ -3,12 +3,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doThrow; -import java.io.IOException; +import java.util.Map; +import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -18,12 +18,15 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; import com.autobuild.pipeline.executor.dto.PipelineExecuteRequest; import com.autobuild.pipeline.executor.service.PipelineExecutorService; import com.autobuild.pipeline.testutility.DummyData; +/** + * Unit tests for {@link PipelineExecutorController}. + */ public class PipelineExecutorControllerTest { + @Mock private PipelineExecutorService service; @@ -31,35 +34,29 @@ public class PipelineExecutorControllerTest { private PipelineExecutorController controller; private PipelineExecuteRequest executeRequest = DummyData.getPipelineRequest(); - private PipelineBuildDTO pipelineBuildDTO = DummyData.getPipelineBuildDTO(executeRequest.getPipelineId()); + private UUID buildId = UUID.randomUUID(); @BeforeEach - public void setUp() throws IOException { + public void setUp() { MockitoAnnotations.openMocks(this); - - doReturn(pipelineBuildDTO).when(service).executePipeline(executeRequest); + doReturn(buildId).when(service).executePipeline(executeRequest); } @Test - public void testExecutePipeline() throws IOException { - ResponseEntity response = controller.executePipeline(executeRequest); - + public void testExecutePipeline() { + ResponseEntity> response = controller.executePipeline(executeRequest); + assertNotNull(response); assertEquals(HttpStatus.ACCEPTED, response.getStatusCode()); - - PipelineBuildDTO responseDto = response.getBody(); - - assertNotNull(responseDto); - assertEquals(executeRequest.getPipelineId(), responseDto.getPipelineId()); - - assertNotNull(responseDto.getStageBuilds()); - assertTrue(responseDto.getStageBuilds().size() > 0); + assertNotNull(response.getBody()); + assertEquals(buildId, response.getBody().get("buildId")); } @Test - public void testExecutePipelineRuntimeError() throws IOException { - doThrow(new RuntimeException("Something runtime exception")).when(service).executePipeline(any(PipelineExecuteRequest.class)); + public void testExecutePipelineRuntimeError() { + doThrow(new RuntimeException("Something runtime exception")) + .when(service).executePipeline(any(PipelineExecuteRequest.class)); - assertThrows(RuntimeException.class,() -> controller.executePipeline(executeRequest)); + assertThrows(RuntimeException.class, () -> controller.executePipeline(executeRequest)); } } diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java deleted file mode 100644 index ad4a59bd..00000000 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/messaging/PipelineBuildMessageConsumerTest.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.autobuild.pipeline.executor.messaging; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.Optional; -import java.util.UUID; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.mockito.InjectMocks; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import com.autobuild.pipeline.executor.entity.PipelineBuild; -import com.autobuild.pipeline.executor.job.PipelineExecutor; -import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; -import com.autobuild.pipeline.testutility.DummyData; - -import jakarta.persistence.EntityNotFoundException; - -/** - * Unit tests for {@link PipelineBuildMessageConsumer}. - * - * @author Suvabrata Chowdhury - */ -public class PipelineBuildMessageConsumerTest { - - @Mock - private PipelineBuildRepository buildRepository; - - @Mock - private PipelineExecutor pipelineExecutor; - - @InjectMocks - private PipelineBuildMessageConsumer consumer; - - @BeforeEach - public void setup() { - MockitoAnnotations.openMocks(this); - } - - @Test - public void consume_whenBuildExists_executesIt() { - UUID pipelineId = UUID.randomUUID(); - PipelineBuild build = DummyData.getPipelineBuild(pipelineId); - - when(buildRepository.findByIdWithStageBuilds(build.getId())).thenReturn(Optional.of(build)); - - consumer.consume(build.getId().toString()); - - verify(pipelineExecutor, times(1)).executePipeline(eq(build)); - } - - @Test - public void consume_whenBuildNotFound_throwsEntityNotFoundException() { - UUID buildId = UUID.randomUUID(); - - when(buildRepository.findByIdWithStageBuilds(buildId)).thenReturn(Optional.empty()); - - assertThrows(EntityNotFoundException.class, () -> consumer.consume(buildId.toString())); - } -} \ No newline at end of file diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineExecutorServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineExecutorServiceTest.java index ef00bba1..abe76ab8 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineExecutorServiceTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineExecutorServiceTest.java @@ -1,14 +1,13 @@ package com.autobuild.pipeline.executor.service; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mockStatic; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; -import java.io.IOException; import java.util.Optional; import java.util.UUID; @@ -16,71 +15,85 @@ import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; import org.mockito.Mock; -import org.mockito.MockedStatic; import org.mockito.MockitoAnnotations; -import org.springframework.transaction.support.TransactionSynchronizationManager; +import com.autobuild.pipeline.configuration.FeatureFlagService; import com.autobuild.pipeline.definiton.entity.Pipeline; import com.autobuild.pipeline.definiton.repository.PipelineRepository; -import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; import com.autobuild.pipeline.executor.dto.PipelineExecuteRequest; -import com.autobuild.pipeline.executor.dto.mapper.PipelineBuildMapper; -import com.autobuild.pipeline.executor.entity.PipelineBuild; +import com.autobuild.pipeline.executor.dto.messaging.PipelineBuildRequestMessage; import com.autobuild.pipeline.executor.job.PipelineExecutor; -import com.autobuild.pipeline.executor.repository.PipelineBuildRepository; +import com.autobuild.pipeline.executor.messaging.PipelineBuildMessagePublisher; import com.autobuild.pipeline.testutility.DummyData; -import com.autobuild.pipeline.utility.file.PipelineFileService; +import jakarta.persistence.EntityNotFoundException; + +/** + * Unit tests for {@link PipelineExecutorService}. + */ public class PipelineExecutorServiceTest { @Mock private PipelineRepository pipelineRepository; @Mock - private PipelineBuildRepository pipelineBuildRepository; - - @Mock - private PipelineExecutor pipelineExecutor; + private FeatureFlagService featureFlagService; @Mock - private PipelineBuildMapper pipelineBuildMapper; + private PipelineBuildMessagePublisher messagePublisher; @Mock - private PipelineFileService pipelineFileService; + private PipelineExecutor pipelineExecutor; @InjectMocks private PipelineExecutorService pipelineExecutorService; - private PipelineBuildDTO pipelineBuildDTO = DummyData.getPipelineBuildDTO(); - @BeforeEach public void setup() { MockitoAnnotations.openMocks(this); } @Test - public void executePipelineTest() throws IOException { + public void executePipeline_whenFlagEnabled_publishesMessageAndReturnsBuildId() { UUID pipelineId = UUID.randomUUID(); + Pipeline pipeline = DummyData.getPipeline(pipelineId); + PipelineExecuteRequest request = new PipelineExecuteRequest(pipelineId); + + when(pipelineRepository.findById(pipelineId)).thenReturn(Optional.of(pipeline)); + when(featureFlagService.getBooleanValue(any())).thenReturn(true); + UUID buildId = pipelineExecutorService.executePipeline(request); + + assertNotNull(buildId); + verify(messagePublisher, times(1)).publish(any(PipelineBuildRequestMessage.class)); + verify(pipelineExecutor, never()).executePipeline(any()); + } + + @Test + public void executePipeline_whenFlagDisabled_callsDirectExecutor() { + UUID pipelineId = UUID.randomUUID(); Pipeline pipeline = DummyData.getPipeline(pipelineId); + PipelineExecuteRequest request = new PipelineExecuteRequest(pipelineId); - PipelineExecuteRequest pipelineExecuteRequest = new PipelineExecuteRequest(pipelineId); - PipelineBuild pipelineBuild = DummyData.getPipelineBuild(pipelineId); - PipelineBuildDTO pipelineBuildDTO = DummyData.getPipelineBuildDTO(pipelineId); + when(pipelineRepository.findById(pipelineId)).thenReturn(Optional.of(pipeline)); + when(featureFlagService.getBooleanValue(any())).thenReturn(false); - doReturn(Optional.of(pipeline)).when(pipelineRepository).findById(any(UUID.class)); - doReturn(pipelineBuild).when(pipelineBuildRepository).save(any(PipelineBuild.class)); - doReturn(pipelineBuildDTO).when(pipelineBuildMapper).entityToDto(pipelineBuild); + UUID buildId = pipelineExecutorService.executePipeline(request); - try (MockedStatic transactionSynMockedStatic = mockStatic( - TransactionSynchronizationManager.class)) { - PipelineBuildDTO resultantDTO = pipelineExecutorService.executePipeline(pipelineExecuteRequest); + assertNotNull(buildId); + verify(messagePublisher, never()).publish(any()); + verify(pipelineExecutor, times(1)).executePipeline(any()); + } - assertEquals(pipelineExecuteRequest.getPipelineId(), resultantDTO.getPipelineId()); + @Test + public void executePipeline_whenPipelineNotFound_throwsEntityNotFoundException() { + UUID pipelineId = UUID.randomUUID(); + PipelineExecuteRequest request = new PipelineExecuteRequest(pipelineId); - verify(pipelineRepository, times(1)).findById(eq(pipelineId)); - verify(pipelineBuildRepository, times(1)).save(any(PipelineBuild.class)); + when(pipelineRepository.findById(pipelineId)).thenReturn(Optional.empty()); - } + assertThrows(EntityNotFoundException.class, () -> pipelineExecutorService.executePipeline(request)); + verify(messagePublisher, never()).publish(any()); + verify(pipelineExecutor, never()).executePipeline(any()); } } diff --git a/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java b/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java index 709c2bd0..fffe7c36 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java @@ -10,6 +10,8 @@ import com.autobuild.pipeline.executor.dto.PipelineBuildDTO; import com.autobuild.pipeline.executor.dto.PipelineExecuteRequest; import com.autobuild.pipeline.executor.dto.StageBuildDTO; +import com.autobuild.pipeline.executor.dto.messaging.PipelineBuildRequestMessage; +import com.autobuild.pipeline.executor.dto.messaging.StageDefinition; import com.autobuild.pipeline.executor.entity.PipelineBuild; import com.autobuild.pipeline.executor.entity.StageBuild; import com.autobuild.pipeline.executor.execution.state.PipelineExecutionState; @@ -66,4 +68,9 @@ public static PipelineBuildDTO getPipelineBuildDTO() { public static PipelineBuildDTO getPipelineBuildDTO(UUID pipelineId) { return new PipelineBuildDTO(UUID.randomUUID(), pipelineId, "Dummy Pipeline", PipelineExecutionState.WAITING, List.of(DummyData.getStageBuildDTO())); } + + public static PipelineBuildRequestMessage getPipelineBuildRequestMessage(UUID pipelineId) { + StageDefinition stage = new StageDefinition("dummyStage1", "bash", "./dummyFolder/", 0); + return new PipelineBuildRequestMessage(UUID.randomUUID(), pipelineId, "my pipeline", List.of(stage)); + } } \ No newline at end of file From 24c49cc0fb681936699b798495b4759746d95fc8 Mon Sep 17 00:00:00 2001 From: WusatSami03 Date: Fri, 13 Nov 2026 00:05:25 +0530 Subject: [PATCH 3/3] openapi regenerate --- apis/openapi-spec/pipeline-service.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apis/openapi-spec/pipeline-service.yaml b/apis/openapi-spec/pipeline-service.yaml index 6d945b88..3de5d056 100644 --- a/apis/openapi-spec/pipeline-service.yaml +++ b/apis/openapi-spec/pipeline-service.yaml @@ -156,12 +156,15 @@ paths: $ref: "#/components/schemas/PipelineExecuteRequest" required: true responses: - "203": - description: Non-Authoritative Information + "202": + description: Accepted content: application/json: schema: - $ref: "#/components/schemas/PipelineBuild" + type: object + additionalProperties: + type: string + format: uuid security: - bearerAuth: [] /api/v1/stage/build/logs/{stageBuildId}: