diff --git a/apis/openapi-spec/pipeline-service.yaml b/apis/openapi-spec/pipeline-service.yaml index 6d945b88..886fa1ca 100644 --- a/apis/openapi-spec/pipeline-service.yaml +++ b/apis/openapi-spec/pipeline-service.yaml @@ -304,6 +304,9 @@ components: - RUNNING - SUCCESS - FAILED + startedAt: + type: string + format: date-time stageBuilds: type: array items: diff --git a/pipeline/src/main/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfig.java b/pipeline/src/main/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfig.java index d4d6495e..59bb3b6a 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfig.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfig.java @@ -28,6 +28,7 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws .csrf(csrf -> csrf.disable()) .cors(cors -> cors.configurationSource(corsConfigurationSource)) .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()) + .headers(headers -> headers.frameOptions(frame -> frame.sameOrigin())) .httpBasic(basic -> basic.disable()) .formLogin(form -> form.disable()); diff --git a/pipeline/src/main/java/com/autobuild/pipeline/configuration/MapperConfig.java b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MapperConfig.java index d8144168..87588b57 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/configuration/MapperConfig.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/configuration/MapperConfig.java @@ -104,6 +104,7 @@ private void setPipelineBuildEntityDTOMapping(ModelMapper mapper) { typeMapper.addMapping(pipelineBuild -> pipelineBuild.getPipeline().getName(), PipelineBuildDTO::setPipelineName); typeMapper.addMapping(PipelineBuild::getCurrentState, PipelineBuildDTO::setCurrentState); + typeMapper.addMapping(PipelineBuild::getStartedAt, PipelineBuildDTO::setStartedAt); } private void setPipelineBuildDTOEntityMapping(ModelMapper mapper) { diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/PipelineBuildDTO.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/PipelineBuildDTO.java index f39cbe2a..daebe4f9 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/PipelineBuildDTO.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/dto/PipelineBuildDTO.java @@ -1,5 +1,6 @@ package com.autobuild.pipeline.executor.dto; +import java.time.Instant; import java.util.List; import java.util.UUID; @@ -31,6 +32,8 @@ public class PipelineBuildDTO { private String pipelineName; private PipelineExecutionState currentState; + + private Instant startedAt; private List stageBuilds; } diff --git a/pipeline/src/main/java/com/autobuild/pipeline/executor/entity/PipelineBuild.java b/pipeline/src/main/java/com/autobuild/pipeline/executor/entity/PipelineBuild.java index ca46c3df..9506cc75 100644 --- a/pipeline/src/main/java/com/autobuild/pipeline/executor/entity/PipelineBuild.java +++ b/pipeline/src/main/java/com/autobuild/pipeline/executor/entity/PipelineBuild.java @@ -1,5 +1,6 @@ package com.autobuild.pipeline.executor.entity; +import java.time.Instant; import java.util.List; import java.util.UUID; @@ -58,6 +59,9 @@ public class PipelineBuild { @Column(name = "pipeline_build_current_state", nullable = false) private PipelineExecutionState currentState; + @Column(name = "start_at", nullable = false) + private Instant startedAt; + public PipelineBuild(Pipeline pipeline, List stageBuilds) { this.pipeline = pipeline; this.stageBuilds = stageBuilds; @@ -68,5 +72,6 @@ public void setDefaultState() { if (null == this.currentState) { this.currentState = PipelineExecutionState.WAITING; } + this.startedAt = Instant.now(); } -} \ No newline at end of file +} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfigTest.java b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfigTest.java index d0e2b642..f3ce371a 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfigTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/DefaultSecurityConfigTest.java @@ -26,6 +26,7 @@ public void setup() throws Exception { doReturn(mockHttpSecurity).when(mockHttpSecurity).csrf(any()); doReturn(mockHttpSecurity).when(mockHttpSecurity).cors(any()); doReturn(mockHttpSecurity).when(mockHttpSecurity).authorizeHttpRequests(any()); + doReturn(mockHttpSecurity).when(mockHttpSecurity).headers(any()); doReturn(mockHttpSecurity).when(mockHttpSecurity).httpBasic(any()); doReturn(mockHttpSecurity).when(mockHttpSecurity).formLogin(any()); } @@ -36,6 +37,7 @@ void testDefaultSecurity() throws Exception { verify(mockHttpSecurity,times(1)).csrf(any()); verify(mockHttpSecurity,times(1)).authorizeHttpRequests(any()); + verify(mockHttpSecurity,times(1)).headers(any()); verify(mockHttpSecurity,times(1)).httpBasic(any()); verify(mockHttpSecurity,times(1)).formLogin(any()); } diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineBuildControllerTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineBuildControllerTest.java index 7b48f65c..2635f4a0 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineBuildControllerTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/controller/PipelineBuildControllerTest.java @@ -45,7 +45,7 @@ public void getPipelineBuildTest() { UUID pipelineBuildId = UUID.randomUUID(); PipelineBuildDTO dummyPipelineDTO = new PipelineBuildDTO(pipelineBuildId, UUID.randomUUID(), "Dummy Pipeline", - PipelineExecutionState.WAITING, List.of(DummyData.getStageBuildDTO())); + PipelineExecutionState.WAITING, null, List.of(DummyData.getStageBuildDTO())); doReturn(dummyPipelineDTO).when(service).getPipelineBuild(pipelineBuildId); @@ -69,10 +69,10 @@ public void getPipelineBuildWithInvalidUUIDTest() { @Test public void getAllBuildsTest() { List dummyBuilds = List.of( - new PipelineBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Pipeline",PipelineExecutionState.WAITING, - List.of(DummyData.getStageBuildDTO())), + new PipelineBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Pipeline", PipelineExecutionState.WAITING, + null, List.of(DummyData.getStageBuildDTO())), new PipelineBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Pipeline", PipelineExecutionState.SUCCESS, - List.of(DummyData.getStageBuildDTO()))); + null, List.of(DummyData.getStageBuildDTO()))); doReturn(dummyBuilds).when(service).getAllBuilds(); ResponseEntity> response = controller.getAllBuilds(); assertNotNull(response); 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..990e30a9 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/testutility/DummyData.java @@ -1,5 +1,6 @@ package com.autobuild.pipeline.testutility; +import java.time.Instant; import java.util.List; import java.util.UUID; @@ -48,11 +49,11 @@ public static StageBuild getStageBuild() { } public static PipelineBuild getPipelineBuild() { - return new PipelineBuild(UUID.randomUUID(), DummyData.getPipeline(), List.of(DummyData.getStageBuild()), PipelineExecutionState.WAITING); + return new PipelineBuild(UUID.randomUUID(), DummyData.getPipeline(), List.of(DummyData.getStageBuild()), PipelineExecutionState.WAITING, null); } public static PipelineBuild getPipelineBuild(UUID pipelineUuid) { - return new PipelineBuild(UUID.randomUUID(), DummyData.getPipeline(pipelineUuid), List.of(DummyData.getStageBuild()), PipelineExecutionState.WAITING); + return new PipelineBuild(UUID.randomUUID(), DummyData.getPipeline(pipelineUuid), List.of(DummyData.getStageBuild()), PipelineExecutionState.WAITING, null); } public static StageBuildDTO getStageBuildDTO() { @@ -60,10 +61,10 @@ public static StageBuildDTO getStageBuildDTO() { } public static PipelineBuildDTO getPipelineBuildDTO() { - return new PipelineBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Pipeline", PipelineExecutionState.WAITING, List.of(DummyData.getStageBuildDTO())); + return new PipelineBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Pipeline", PipelineExecutionState.WAITING, null, List.of(DummyData.getStageBuildDTO())); } public static PipelineBuildDTO getPipelineBuildDTO(UUID pipelineId) { - return new PipelineBuildDTO(UUID.randomUUID(), pipelineId, "Dummy Pipeline", PipelineExecutionState.WAITING, List.of(DummyData.getStageBuildDTO())); + return new PipelineBuildDTO(UUID.randomUUID(), pipelineId, "Dummy Pipeline", PipelineExecutionState.WAITING, null, List.of(DummyData.getStageBuildDTO())); } } \ No newline at end of file