Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions apis/openapi-spec/pipeline-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ components:
- RUNNING
- SUCCESS
- FAILED
startedAt:
type: string
format: date-time
stageBuilds:
type: array
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.autobuild.pipeline.executor.dto;

import java.time.Instant;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -31,6 +32,8 @@ public class PipelineBuildDTO {
private String pipelineName;

private PipelineExecutionState currentState;

private Instant startedAt;

private List<StageBuildDTO> stageBuilds;
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.autobuild.pipeline.executor.entity;

import java.time.Instant;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -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<StageBuild> stageBuilds) {
this.pipeline = pipeline;
this.stageBuilds = stageBuilds;
Expand All @@ -68,5 +72,6 @@ public void setDefaultState() {
if (null == this.currentState) {
this.currentState = PipelineExecutionState.WAITING;
}
this.startedAt = Instant.now();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand All @@ -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());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -69,10 +69,10 @@ public void getPipelineBuildWithInvalidUUIDTest() {
@Test
public void getAllBuildsTest() {
List<PipelineBuildDTO> 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<List<PipelineBuildDTO>> response = controller.getAllBuilds();
assertNotNull(response);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.autobuild.pipeline.testutility;

import java.time.Instant;
import java.util.List;
import java.util.UUID;

Expand Down Expand Up @@ -48,22 +49,22 @@ 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() {
return new StageBuildDTO(UUID.randomUUID(), UUID.randomUUID(), "Dummy Stage", StageExecutionState.WAITING);
}

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()));
}
}
Loading