From 8cccecf6f6425f8f4dd14e1981d737aba315b86c Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Mon, 2 Nov 2026 00:54:07 +0530 Subject: [PATCH 01/21] Dockerfile for backend service added also added tests to have 80% coverage --- docker-compose.yml | 33 ++++- pipeline/.dockerignore | 11 ++ Dockerfile => pipeline/Dockerfile | 8 +- .../CustomAuthenticationEntryPointTest.java | 38 ++++++ .../security/KeycloakJwtConverterTest.java | 114 ++++++++++++++++++ .../entity/PipelineExecutorEntityTest.java | 53 ++++++++ .../service/PipelineBuildServiceTest.java | 30 +++++ .../service/StageBuildServiceTest.java | 63 ++++++++++ .../LocalPipelineFileServiceImplTest.java | 46 +++++++ 9 files changed, 391 insertions(+), 5 deletions(-) create mode 100644 pipeline/.dockerignore rename Dockerfile => pipeline/Dockerfile (63%) create mode 100644 pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java create mode 100644 pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java create mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java create mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java diff --git a/docker-compose.yml b/docker-compose.yml index fdc4bd1a..48fe5996 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -68,6 +68,9 @@ services: networks: - app pipeline-app: + build: + context: . + dockerfile: pipeline/Dockerfile image: pipeline-app container_name: pipeline-app environment: @@ -82,8 +85,8 @@ services: ports: - "8080:8080" volumes: - - pipeline_scripts:/app/pipeline_scripts - - pipeline_build_logs:/app/pipeline_build_logs + - pipeline_scripts:/pipeline_scripts + - pipeline_build_logs:/pipeline_build_logs networks: - app depends_on: @@ -92,4 +95,28 @@ services: auth-service: condition: service_healthy flagd: - condition: service_started \ No newline at end of file + condition: service_started + pipeline-ui: + build: + context: . + dockerfile: pipeline-ui/Dockerfile + args: + VITE_API_BASE_URL: http://localhost:8080/api/v1 + VITE_IDP: keycloak + VITE_KC_URL: http://localhost:8180 + VITE_KC_REALM: SpringBootRealm + VITE_KC_CLIENTID: pipeline-app + image: pipeline-ui + container_name: pipeline-ui + ports: + - "3000:80" + networks: + - app + depends_on: + pipeline-app: + condition: service_started + healthcheck: + test: ["CMD", "wget", "-qO-", "http://localhost:80"] + interval: 10s + timeout: 5s + retries: 3 \ No newline at end of file diff --git a/pipeline/.dockerignore b/pipeline/.dockerignore new file mode 100644 index 00000000..2cf39eb1 --- /dev/null +++ b/pipeline/.dockerignore @@ -0,0 +1,11 @@ +target/ +*.md +.git +BUILD.bazel +run_tests.sh +run_generate_openapi.sh +mvnw +mvnw.cmd +checkstyle.xml +.idea +.vscode diff --git a/Dockerfile b/pipeline/Dockerfile similarity index 63% rename from Dockerfile rename to pipeline/Dockerfile index 969363a9..fabafd88 100644 --- a/Dockerfile +++ b/pipeline/Dockerfile @@ -11,9 +11,13 @@ RUN mvn clean package -DskipTests -Pmonitoring # # Runtime stage # -FROM eclipse-temurin:17-jdk-jammy +FROM eclipse-temurin:17-jre-jammy +RUN groupadd --system appgroup && useradd --system --gid appgroup appuser WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar COPY --from=build /home/app/target/agents/*.jar otel-agent.jar +RUN mkdir -p /pipeline_scripts /pipeline_build_logs \ + && chown -R appuser:appgroup /app /pipeline_scripts /pipeline_build_logs +USER appuser EXPOSE 8080 -ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] \ No newline at end of file +ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] diff --git a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java new file mode 100644 index 00000000..22f799db --- /dev/null +++ b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java @@ -0,0 +1,38 @@ +package com.autobuild.pipeline.auth.security; + +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; + +import org.junit.jupiter.api.Test; +import org.springframework.security.core.AuthenticationException; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; + +public class CustomAuthenticationEntryPointTest { + + private final CustomAuthenticationEntryPoint entryPoint = new CustomAuthenticationEntryPoint(); + + @Test + void commenceSetsUnauthorizedStatusAndWritesJson() throws IOException { + HttpServletRequest request = mock(HttpServletRequest.class); + HttpServletResponse response = mock(HttpServletResponse.class); + AuthenticationException authException = mock(AuthenticationException.class); + + when(request.getRequestURI()).thenReturn("/api/v1/pipelines"); + + StringWriter stringWriter = new StringWriter(); + PrintWriter printWriter = new PrintWriter(stringWriter); + when(response.getWriter()).thenReturn(printWriter); + + entryPoint.commence(request, response, authException); + + verify(response).setStatus(HttpServletResponse.SC_UNAUTHORIZED); + verify(response).setContentType("application/json"); + } +} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java new file mode 100644 index 00000000..503f733b --- /dev/null +++ b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java @@ -0,0 +1,114 @@ +package com.autobuild.pipeline.auth.security; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import org.junit.jupiter.api.Test; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.oauth2.jwt.Jwt; + +public class KeycloakJwtConverterTest { + + private final KeycloakJwtConverter converter = new KeycloakJwtConverter(); + + @Test + void convertReturnsEmptyWhenNoClaimsPresent() { + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(null); + when(jwt.getClaim("resource_access")).thenReturn(null); + + Collection authorities = converter.convert(jwt); + + assertTrue(authorities.isEmpty()); + } + + @Test + void convertExtractsRealmRoles() { + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(Map.of("roles", List.of("admin", "user"))); + when(jwt.getClaim("resource_access")).thenReturn(null); + + Collection authorities = converter.convert(jwt); + + assertEquals(2, authorities.size()); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_ADMIN"))); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_USER"))); + } + + @Test + void convertSkipsRealmAccessWithNoRolesKey() { + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(Map.of("other_key", List.of("something"))); + when(jwt.getClaim("resource_access")).thenReturn(null); + + Collection authorities = converter.convert(jwt); + + assertTrue(authorities.isEmpty()); + } + + @Test + void convertExtractsClientRoles() { + Map clientData = Map.of("roles", List.of("read", "write")); + Map resourceAccess = Map.of("my-client", clientData); + + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(null); + when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); + + Collection authorities = converter.convert(jwt); + + assertEquals(2, authorities.size()); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_READ"))); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_WRITE"))); + } + + @Test + void convertSkipsClientEntryWithNoRolesKey() { + Map clientData = Map.of("other_key", List.of("something")); + Map resourceAccess = Map.of("my-client", clientData); + + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(null); + when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); + + Collection authorities = converter.convert(jwt); + + assertTrue(authorities.isEmpty()); + } + + @Test + void convertSkipsClientEntryThatIsNotAMap() { + Map resourceAccess = Map.of("my-client", "not-a-map"); + + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(null); + when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); + + Collection authorities = converter.convert(jwt); + + assertTrue(authorities.isEmpty()); + } + + @Test + void convertCombinesRealmAndClientRoles() { + Map realmAccess = Map.of("roles", List.of("realm-role")); + Map clientData = Map.of("roles", List.of("client-role")); + Map resourceAccess = Map.of("app", clientData); + + Jwt jwt = mock(Jwt.class); + when(jwt.getClaim("realm_access")).thenReturn(realmAccess); + when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); + + Collection authorities = converter.convert(jwt); + + assertEquals(2, authorities.size()); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_REALM-ROLE"))); + assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_CLIENT-ROLE"))); + } +} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java new file mode 100644 index 00000000..5251e8f1 --- /dev/null +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java @@ -0,0 +1,53 @@ +package com.autobuild.pipeline.executor.entity; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; + +import com.autobuild.pipeline.executor.execution.state.PipelineExecutionState; +import com.autobuild.pipeline.executor.execution.state.StageExecutionState; +import com.autobuild.pipeline.testutility.DummyData; + +public class PipelineExecutorEntityTest { + + @Test + void pipelineBuildSetDefaultStateSetsWaitingWhenNull() { + PipelineBuild build = new PipelineBuild(); + assertNull(build.getCurrentState()); + + build.setDefaultState(); + + assertEquals(PipelineExecutionState.WAITING, build.getCurrentState()); + } + + @Test + void pipelineBuildSetDefaultStateDoesNotOverwriteExistingState() { + PipelineBuild build = DummyData.getPipelineBuild(); + build.setCurrentState(PipelineExecutionState.SUCCESS); + + build.setDefaultState(); + + assertEquals(PipelineExecutionState.SUCCESS, build.getCurrentState()); + } + + @Test + void stageBuildSetDefaultStateSetsWaitingWhenNull() { + StageBuild stageBuild = new StageBuild(); + assertNull(stageBuild.getCurrentState()); + + stageBuild.setDefaultState(); + + assertEquals(StageExecutionState.WAITING, stageBuild.getCurrentState()); + } + + @Test + void stageBuildSetDefaultStateDoesNotOverwriteExistingState() { + StageBuild stageBuild = DummyData.getStageBuild(); + stageBuild.setCurrentState(StageExecutionState.SUCCESS); + + stageBuild.setDefaultState(); + + assertEquals(StageExecutionState.SUCCESS, stageBuild.getCurrentState()); + } +} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java index 58deed36..07278d58 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java @@ -1,5 +1,6 @@ package com.autobuild.pipeline.executor.service; +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; @@ -82,4 +83,33 @@ public void getAllBuildsTest() { verify(mapper, times(2)).entityToDto(any(PipelineBuildEntity.class)); } + + @Test + public void getPipelineBuildReturnsDto() { + UUID buildId = UUID.randomUUID(); + PipelineBuild pipelineBuild = DummyData.getPipelineBuild(buildId); + doReturn(Optional.of(pipelineBuild)).when(repository).findById(buildId); + + pipelineBuildService.getPipelineBuild(buildId); + + verify(mapper, times(1)).entityToDto(pipelineBuild); + } + + @Test + public void getPipelineBuildThrowsWhenNotFound() { + UUID buildId = UUID.randomUUID(); + doReturn(Optional.empty()).when(repository).findById(buildId); + + assertThrows(jakarta.persistence.EntityNotFoundException.class, + () -> pipelineBuildService.getPipelineBuild(buildId)); + } + + @Test + public void deletePipelineBuildThrowsWhenNotFound() { + UUID buildId = UUID.randomUUID(); + doReturn(Optional.empty()).when(repository).findById(buildId); + + assertThrows(jakarta.persistence.EntityNotFoundException.class, + () -> pipelineBuildService.deletePipelineBuild(buildId)); + } } diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java new file mode 100644 index 00000000..e803d2ae --- /dev/null +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java @@ -0,0 +1,63 @@ +package com.autobuild.pipeline.executor.service; + +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; + +import java.io.IOException; +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.StageBuild; +import com.autobuild.pipeline.executor.repository.StageBuildRepository; +import com.autobuild.pipeline.testutility.DummyData; +import com.autobuild.pipeline.utility.file.PipelineFileService; + +import jakarta.persistence.EntityNotFoundException; + +public class StageBuildServiceTest { + + @Mock + private StageBuildRepository repository; + + @Mock + private PipelineFileService pipelineFileService; + + @InjectMocks + private StageBuildService stageBuildService; + + @BeforeEach + void setup() { + MockitoAnnotations.openMocks(this); + } + + @Test + void getStageBuildLogsReturnsLogMap() throws IOException { + UUID stageBuildId = UUID.randomUUID(); + StageBuild stageBuild = DummyData.getStageBuild(); + doReturn(Optional.of(stageBuild)).when(repository).findById(stageBuildId); + doReturn("log line 1\nlog line 2").when(pipelineFileService).readStageBuildLogFile(stageBuild); + + var result = stageBuildService.getStageBuildLogs(stageBuildId); + + verify(pipelineFileService, times(1)).readStageBuildLogFile(any(StageBuild.class)); + assert result.containsKey("log"); + } + + @Test + void getStageBuildLogsThrowsWhenNotFound() { + UUID stageBuildId = UUID.randomUUID(); + doReturn(Optional.empty()).when(repository).findById(stageBuildId); + + assertThrows(EntityNotFoundException.class, + () -> stageBuildService.getStageBuildLogs(stageBuildId)); + } +} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java index 4d9b8654..5f0312c6 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java @@ -9,6 +9,7 @@ import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; import java.util.List; +import java.util.UUID; import java.util.stream.Stream; import org.junit.jupiter.api.AfterEach; @@ -154,4 +155,49 @@ public void testReadStageScriptFileBlankPath() throws IOException { assert content.isEmpty(); filesMockedStatic.verify(() -> Files.readAllLines(any(Path.class)), times(0)); } + + @Test + public void testReadStageScriptFileNullStage() throws IOException { + String content = pipelineFileService.readStageScriptFile((Stage) null); + assert content.isEmpty(); + filesMockedStatic.verify(() -> Files.readAllLines(any(Path.class)), times(0)); + } + + @Test + public void testReadStageBuildLogFileNullStageThrows() { + try { + pipelineFileService.readStageBuildLogFile(null); + assert false : "Expected IllegalArgumentException"; + } catch (IllegalArgumentException | IOException e) { + // expected + } + } + + @Test + public void testCreateStageScriptFileWhenPipelineDirectoryExists() throws IOException { + // Override exists to return true so the createDirectories branch for pipeline dir is skipped + filesMockedStatic.when(() -> Files.exists(any(Path.class))).thenReturn(true); + + StageDTO newStage = pipelineDTO.getStages().get(0); + String path = pipelineFileService.createStageScriptFile(pipeline, newStage); + + // Parent directory exists – createDirectories should NOT be called + filesMockedStatic.verify(() -> Files.createDirectories(any(Path.class), any(FileAttribute.class)), times(0)); + filesMockedStatic.verify(() -> Files.createFile(any(Path.class), any(FileAttribute.class)), times(1)); + assert path != null && !path.isBlank(); + } + + @Test + public void testCreateLogFileWhenLogsDirectoryExists() throws IOException { + filesMockedStatic.when(() -> Files.exists(any(Path.class))).thenReturn(true); + + UUID pipelineBuildId = UUID.randomUUID(); + UUID stageBuildId = UUID.randomUUID(); + String logPath = pipelineFileService.createLogFile(pipelineBuildId, stageBuildId); + + // Both parent and build-logs directory already exist – no createDirectories + filesMockedStatic.verify(() -> Files.createDirectories(any(Path.class), any(FileAttribute.class)), times(0)); + filesMockedStatic.verify(() -> Files.createFile(any(Path.class), any(FileAttribute.class)), times(1)); + assert logPath != null && !logPath.isBlank(); + } } \ No newline at end of file From 6c960a8e85c6d72c8c2a55e2d40d6872c03de1d2 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Mon, 2 Nov 2026 00:54:51 +0530 Subject: [PATCH 02/21] Added the docker file for ui side. It has been tested. --- pipeline-ui/.dockerignore | 11 ++++++++++ pipeline-ui/Dockerfile | 34 +++++++++++++++++++++++++++++ pipeline-ui/Dockerfile.dockerignore | 12 ++++++++++ pipeline-ui/nginx.conf | 9 ++++++++ 4 files changed, 66 insertions(+) create mode 100644 pipeline-ui/.dockerignore create mode 100644 pipeline-ui/Dockerfile create mode 100644 pipeline-ui/Dockerfile.dockerignore create mode 100644 pipeline-ui/nginx.conf diff --git a/pipeline-ui/.dockerignore b/pipeline-ui/.dockerignore new file mode 100644 index 00000000..b1ef71cb --- /dev/null +++ b/pipeline-ui/.dockerignore @@ -0,0 +1,11 @@ +node_modules/ +dist/ +coverage/ +.env.* +test/ +*.md +.git +BUILD.bazel +run_tests.sh +.idea +.vscode diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile new file mode 100644 index 00000000..2d71261e --- /dev/null +++ b/pipeline-ui/Dockerfile @@ -0,0 +1,34 @@ +# +# Build stage +# +FROM node:22-alpine AS build +RUN apk add --no-cache openjdk17-jre-headless +WORKDIR /app +COPY pipeline-ui/package*.json ./ +RUN npm ci +COPY pipeline-ui/ . +COPY apis/openapi-spec/ /apis/openapi-spec/ +RUN npm run generate:client-code +ARG VITE_API_BASE_URL=http://localhost:8080/api/v1 +ARG VITE_IDP=keycloak +ARG VITE_KC_URL=http://localhost:8180 +ARG VITE_KC_REALM=SpringBootRealm +ARG VITE_KC_CLIENTID=pipeline-app +ENV VITE_API_BASE_URL=$VITE_API_BASE_URL +ENV VITE_IDP=$VITE_IDP +ENV VITE_KC_URL=$VITE_KC_URL +ENV VITE_KC_REALM=$VITE_KC_REALM +ENV VITE_KC_CLIENTID=$VITE_KC_CLIENTID +RUN npm run build + +# +# Runtime stage +# +FROM nginx:alpine +RUN addgroup -S appgroup && adduser -S appuser -G appgroup +COPY --from=build /app/dist /usr/share/nginx/html +COPY pipeline-ui/nginx.conf /etc/nginx/conf.d/default.conf +RUN chown -R appuser:appgroup /usr/share/nginx/html \ + && chmod -R 755 /usr/share/nginx/html +EXPOSE 80 +CMD ["nginx", "-g", "daemon off;"] diff --git a/pipeline-ui/Dockerfile.dockerignore b/pipeline-ui/Dockerfile.dockerignore new file mode 100644 index 00000000..8ee50580 --- /dev/null +++ b/pipeline-ui/Dockerfile.dockerignore @@ -0,0 +1,12 @@ +pipeline-ui/node_modules/ +pipeline-ui/dist/ +pipeline-ui/coverage/ +pipeline-ui/src/gen/ +pipeline-ui/.env.* +pipeline-ui/test/ +pipeline/target/ +argocd/ +k8s/ +monitoring/ +autobuild-docs/ +.git/ diff --git a/pipeline-ui/nginx.conf b/pipeline-ui/nginx.conf new file mode 100644 index 00000000..f749e021 --- /dev/null +++ b/pipeline-ui/nginx.conf @@ -0,0 +1,9 @@ +server { + listen 80; + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } +} From c34ddbd07534ac789f94ee5e200112920999e958 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Mon, 2 Nov 2026 01:45:02 +0530 Subject: [PATCH 03/21] Turned erasableSyntaxOnly back to false --- pipeline-ui/tsconfig.app.json | 1 + 1 file changed, 1 insertion(+) diff --git a/pipeline-ui/tsconfig.app.json b/pipeline-ui/tsconfig.app.json index f4bd2a0b..10570b49 100644 --- a/pipeline-ui/tsconfig.app.json +++ b/pipeline-ui/tsconfig.app.json @@ -20,6 +20,7 @@ "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, + "erasableSyntaxOnly": true, "noFallthroughCasesInSwitch": true, "noUncheckedSideEffectImports": true }, From 3234f16b7ed362864e7da85855cd2e62a745df54 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 09:24:27 +0530 Subject: [PATCH 04/21] The arguments and env variables are removed from the file --- pipeline-ui/.gitignore | 4 +--- pipeline-ui/Dockerfile | 10 +++++----- pipeline-ui/tsconfig.app.json | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index 378cc896..116bdf99 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -24,6 +24,4 @@ coverage/* *.sln *.sw? -# Generated files -src/gen - +# Generated files \ No newline at end of file diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile index 2d71261e..8146520d 100644 --- a/pipeline-ui/Dockerfile +++ b/pipeline-ui/Dockerfile @@ -9,11 +9,11 @@ RUN npm ci COPY pipeline-ui/ . COPY apis/openapi-spec/ /apis/openapi-spec/ RUN npm run generate:client-code -ARG VITE_API_BASE_URL=http://localhost:8080/api/v1 -ARG VITE_IDP=keycloak -ARG VITE_KC_URL=http://localhost:8180 -ARG VITE_KC_REALM=SpringBootRealm -ARG VITE_KC_CLIENTID=pipeline-app +ARG VITE_API_BASE_URL +ARG VITE_IDP +ARG VITE_KC_URL +ARG VITE_KC_REALM +ARG VITE_KC_CLIENTID ENV VITE_API_BASE_URL=$VITE_API_BASE_URL ENV VITE_IDP=$VITE_IDP ENV VITE_KC_URL=$VITE_KC_URL diff --git a/pipeline-ui/tsconfig.app.json b/pipeline-ui/tsconfig.app.json index 10570b49..7e1ed649 100644 --- a/pipeline-ui/tsconfig.app.json +++ b/pipeline-ui/tsconfig.app.json @@ -20,7 +20,7 @@ "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, - "erasableSyntaxOnly": true, + "erasableSyntaxOnly": false, "noFallthroughCasesInSwitch": true, "noUncheckedSideEffectImports": true }, From f444e3255648f925cdceb09a2781e2c595938a34 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 09:25:59 +0530 Subject: [PATCH 05/21] Fixed the .gitignore --- pipeline-ui/.gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index 116bdf99..e1588ac8 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -24,4 +24,5 @@ coverage/* *.sln *.sw? -# Generated files \ No newline at end of file +# Generated files +src/gen \ No newline at end of file From 67b17daf3492ac0f6c4c6370e9d510ff6adb0151 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 09:31:40 +0530 Subject: [PATCH 06/21] Fixed the test files and removed unwanted testfiles --- .../CustomAuthenticationEntryPointTest.java | 38 ------ .../security/KeycloakJwtConverterTest.java | 114 ------------------ .../entity/PipelineExecutorEntityTest.java | 53 -------- .../service/PipelineBuildServiceTest.java | 31 +---- .../service/StageBuildServiceTest.java | 63 ---------- 5 files changed, 1 insertion(+), 298 deletions(-) delete mode 100644 pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java delete mode 100644 pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java delete mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java delete mode 100644 pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java diff --git a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java deleted file mode 100644 index 22f799db..00000000 --- a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/CustomAuthenticationEntryPointTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.autobuild.pipeline.auth.security; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; - -import org.junit.jupiter.api.Test; -import org.springframework.security.core.AuthenticationException; - -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; - -public class CustomAuthenticationEntryPointTest { - - private final CustomAuthenticationEntryPoint entryPoint = new CustomAuthenticationEntryPoint(); - - @Test - void commenceSetsUnauthorizedStatusAndWritesJson() throws IOException { - HttpServletRequest request = mock(HttpServletRequest.class); - HttpServletResponse response = mock(HttpServletResponse.class); - AuthenticationException authException = mock(AuthenticationException.class); - - when(request.getRequestURI()).thenReturn("/api/v1/pipelines"); - - StringWriter stringWriter = new StringWriter(); - PrintWriter printWriter = new PrintWriter(stringWriter); - when(response.getWriter()).thenReturn(printWriter); - - entryPoint.commence(request, response, authException); - - verify(response).setStatus(HttpServletResponse.SC_UNAUTHORIZED); - verify(response).setContentType("application/json"); - } -} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java b/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java deleted file mode 100644 index 503f733b..00000000 --- a/pipeline/src/test/java/com/autobuild/pipeline/auth/security/KeycloakJwtConverterTest.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.autobuild.pipeline.auth.security; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.Test; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.oauth2.jwt.Jwt; - -public class KeycloakJwtConverterTest { - - private final KeycloakJwtConverter converter = new KeycloakJwtConverter(); - - @Test - void convertReturnsEmptyWhenNoClaimsPresent() { - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(null); - when(jwt.getClaim("resource_access")).thenReturn(null); - - Collection authorities = converter.convert(jwt); - - assertTrue(authorities.isEmpty()); - } - - @Test - void convertExtractsRealmRoles() { - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(Map.of("roles", List.of("admin", "user"))); - when(jwt.getClaim("resource_access")).thenReturn(null); - - Collection authorities = converter.convert(jwt); - - assertEquals(2, authorities.size()); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_ADMIN"))); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_USER"))); - } - - @Test - void convertSkipsRealmAccessWithNoRolesKey() { - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(Map.of("other_key", List.of("something"))); - when(jwt.getClaim("resource_access")).thenReturn(null); - - Collection authorities = converter.convert(jwt); - - assertTrue(authorities.isEmpty()); - } - - @Test - void convertExtractsClientRoles() { - Map clientData = Map.of("roles", List.of("read", "write")); - Map resourceAccess = Map.of("my-client", clientData); - - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(null); - when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); - - Collection authorities = converter.convert(jwt); - - assertEquals(2, authorities.size()); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_READ"))); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_WRITE"))); - } - - @Test - void convertSkipsClientEntryWithNoRolesKey() { - Map clientData = Map.of("other_key", List.of("something")); - Map resourceAccess = Map.of("my-client", clientData); - - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(null); - when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); - - Collection authorities = converter.convert(jwt); - - assertTrue(authorities.isEmpty()); - } - - @Test - void convertSkipsClientEntryThatIsNotAMap() { - Map resourceAccess = Map.of("my-client", "not-a-map"); - - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(null); - when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); - - Collection authorities = converter.convert(jwt); - - assertTrue(authorities.isEmpty()); - } - - @Test - void convertCombinesRealmAndClientRoles() { - Map realmAccess = Map.of("roles", List.of("realm-role")); - Map clientData = Map.of("roles", List.of("client-role")); - Map resourceAccess = Map.of("app", clientData); - - Jwt jwt = mock(Jwt.class); - when(jwt.getClaim("realm_access")).thenReturn(realmAccess); - when(jwt.getClaim("resource_access")).thenReturn(resourceAccess); - - Collection authorities = converter.convert(jwt); - - assertEquals(2, authorities.size()); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_REALM-ROLE"))); - assertTrue(authorities.stream().anyMatch(a -> a.getAuthority().equals("ROLE_CLIENT-ROLE"))); - } -} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java deleted file mode 100644 index 5251e8f1..00000000 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/entity/PipelineExecutorEntityTest.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.autobuild.pipeline.executor.entity; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; - -import org.junit.jupiter.api.Test; - -import com.autobuild.pipeline.executor.execution.state.PipelineExecutionState; -import com.autobuild.pipeline.executor.execution.state.StageExecutionState; -import com.autobuild.pipeline.testutility.DummyData; - -public class PipelineExecutorEntityTest { - - @Test - void pipelineBuildSetDefaultStateSetsWaitingWhenNull() { - PipelineBuild build = new PipelineBuild(); - assertNull(build.getCurrentState()); - - build.setDefaultState(); - - assertEquals(PipelineExecutionState.WAITING, build.getCurrentState()); - } - - @Test - void pipelineBuildSetDefaultStateDoesNotOverwriteExistingState() { - PipelineBuild build = DummyData.getPipelineBuild(); - build.setCurrentState(PipelineExecutionState.SUCCESS); - - build.setDefaultState(); - - assertEquals(PipelineExecutionState.SUCCESS, build.getCurrentState()); - } - - @Test - void stageBuildSetDefaultStateSetsWaitingWhenNull() { - StageBuild stageBuild = new StageBuild(); - assertNull(stageBuild.getCurrentState()); - - stageBuild.setDefaultState(); - - assertEquals(StageExecutionState.WAITING, stageBuild.getCurrentState()); - } - - @Test - void stageBuildSetDefaultStateDoesNotOverwriteExistingState() { - StageBuild stageBuild = DummyData.getStageBuild(); - stageBuild.setCurrentState(StageExecutionState.SUCCESS); - - stageBuild.setDefaultState(); - - assertEquals(StageExecutionState.SUCCESS, stageBuild.getCurrentState()); - } -} diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java index 07278d58..0fbd5982 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java @@ -1,6 +1,5 @@ package com.autobuild.pipeline.executor.service; -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; @@ -84,32 +83,4 @@ public void getAllBuildsTest() { verify(mapper, times(2)).entityToDto(any(PipelineBuildEntity.class)); } - @Test - public void getPipelineBuildReturnsDto() { - UUID buildId = UUID.randomUUID(); - PipelineBuild pipelineBuild = DummyData.getPipelineBuild(buildId); - doReturn(Optional.of(pipelineBuild)).when(repository).findById(buildId); - - pipelineBuildService.getPipelineBuild(buildId); - - verify(mapper, times(1)).entityToDto(pipelineBuild); - } - - @Test - public void getPipelineBuildThrowsWhenNotFound() { - UUID buildId = UUID.randomUUID(); - doReturn(Optional.empty()).when(repository).findById(buildId); - - assertThrows(jakarta.persistence.EntityNotFoundException.class, - () -> pipelineBuildService.getPipelineBuild(buildId)); - } - - @Test - public void deletePipelineBuildThrowsWhenNotFound() { - UUID buildId = UUID.randomUUID(); - doReturn(Optional.empty()).when(repository).findById(buildId); - - assertThrows(jakarta.persistence.EntityNotFoundException.class, - () -> pipelineBuildService.deletePipelineBuild(buildId)); - } -} +} \ No newline at end of file diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java deleted file mode 100644 index e803d2ae..00000000 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/StageBuildServiceTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.autobuild.pipeline.executor.service; - -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; - -import java.io.IOException; -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.StageBuild; -import com.autobuild.pipeline.executor.repository.StageBuildRepository; -import com.autobuild.pipeline.testutility.DummyData; -import com.autobuild.pipeline.utility.file.PipelineFileService; - -import jakarta.persistence.EntityNotFoundException; - -public class StageBuildServiceTest { - - @Mock - private StageBuildRepository repository; - - @Mock - private PipelineFileService pipelineFileService; - - @InjectMocks - private StageBuildService stageBuildService; - - @BeforeEach - void setup() { - MockitoAnnotations.openMocks(this); - } - - @Test - void getStageBuildLogsReturnsLogMap() throws IOException { - UUID stageBuildId = UUID.randomUUID(); - StageBuild stageBuild = DummyData.getStageBuild(); - doReturn(Optional.of(stageBuild)).when(repository).findById(stageBuildId); - doReturn("log line 1\nlog line 2").when(pipelineFileService).readStageBuildLogFile(stageBuild); - - var result = stageBuildService.getStageBuildLogs(stageBuildId); - - verify(pipelineFileService, times(1)).readStageBuildLogFile(any(StageBuild.class)); - assert result.containsKey("log"); - } - - @Test - void getStageBuildLogsThrowsWhenNotFound() { - UUID stageBuildId = UUID.randomUUID(); - doReturn(Optional.empty()).when(repository).findById(stageBuildId); - - assertThrows(EntityNotFoundException.class, - () -> stageBuildService.getStageBuildLogs(stageBuildId)); - } -} From 0548809f29508db64feaac73ca955a42f8b4fecf Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:00:07 +0530 Subject: [PATCH 07/21] Removed the ngnix from the dockerfile of pipeline-ui as well as remove the generator --- pipeline-ui/.gitignore | 2 +- pipeline-ui/Dockerfile | 23 +++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index e1588ac8..4335da9b 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -25,4 +25,4 @@ coverage/* *.sw? # Generated files -src/gen \ No newline at end of file +src/gen diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile index 8146520d..72e6ae23 100644 --- a/pipeline-ui/Dockerfile +++ b/pipeline-ui/Dockerfile @@ -2,13 +2,10 @@ # Build stage # FROM node:22-alpine AS build -RUN apk add --no-cache openjdk17-jre-headless WORKDIR /app -COPY pipeline-ui/package*.json ./ +COPY package*.json ./ RUN npm ci -COPY pipeline-ui/ . -COPY apis/openapi-spec/ /apis/openapi-spec/ -RUN npm run generate:client-code +COPY . . ARG VITE_API_BASE_URL ARG VITE_IDP ARG VITE_KC_URL @@ -22,13 +19,11 @@ ENV VITE_KC_CLIENTID=$VITE_KC_CLIENTID RUN npm run build # -# Runtime stage +# Serve stage # -FROM nginx:alpine -RUN addgroup -S appgroup && adduser -S appuser -G appgroup -COPY --from=build /app/dist /usr/share/nginx/html -COPY pipeline-ui/nginx.conf /etc/nginx/conf.d/default.conf -RUN chown -R appuser:appgroup /usr/share/nginx/html \ - && chmod -R 755 /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] +FROM node:22-alpine +RUN npm install -g serve +WORKDIR /app +COPY --from=build /app/dist ./dist +EXPOSE 3000 +CMD ["serve", "-s", "dist", "-l", "3000"] From ca4bbcea293b29fc96be33467525340e7dfc87fd Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:21:36 +0530 Subject: [PATCH 08/21] Removed the DockerFile.dockerignore file --- pipeline-ui/Dockerfile.dockerignore | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 pipeline-ui/Dockerfile.dockerignore diff --git a/pipeline-ui/Dockerfile.dockerignore b/pipeline-ui/Dockerfile.dockerignore deleted file mode 100644 index 8ee50580..00000000 --- a/pipeline-ui/Dockerfile.dockerignore +++ /dev/null @@ -1,12 +0,0 @@ -pipeline-ui/node_modules/ -pipeline-ui/dist/ -pipeline-ui/coverage/ -pipeline-ui/src/gen/ -pipeline-ui/.env.* -pipeline-ui/test/ -pipeline/target/ -argocd/ -k8s/ -monitoring/ -autobuild-docs/ -.git/ From 0cd3f6dec84f7c10a869b29589f7f035e5b06d7b Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:25:06 +0530 Subject: [PATCH 09/21] Removed the unwanted tests --- .../service/PipelineBuildServiceTest.java | 1 - .../LocalPipelineFileServiceImplTest.java | 45 ------------------- 2 files changed, 46 deletions(-) diff --git a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java index 0fbd5982..75a433bd 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/executor/service/PipelineBuildServiceTest.java @@ -82,5 +82,4 @@ public void getAllBuildsTest() { verify(mapper, times(2)).entityToDto(any(PipelineBuildEntity.class)); } - } \ No newline at end of file diff --git a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java index 5f0312c6..f541f6b5 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java @@ -155,49 +155,4 @@ public void testReadStageScriptFileBlankPath() throws IOException { assert content.isEmpty(); filesMockedStatic.verify(() -> Files.readAllLines(any(Path.class)), times(0)); } - - @Test - public void testReadStageScriptFileNullStage() throws IOException { - String content = pipelineFileService.readStageScriptFile((Stage) null); - assert content.isEmpty(); - filesMockedStatic.verify(() -> Files.readAllLines(any(Path.class)), times(0)); - } - - @Test - public void testReadStageBuildLogFileNullStageThrows() { - try { - pipelineFileService.readStageBuildLogFile(null); - assert false : "Expected IllegalArgumentException"; - } catch (IllegalArgumentException | IOException e) { - // expected - } - } - - @Test - public void testCreateStageScriptFileWhenPipelineDirectoryExists() throws IOException { - // Override exists to return true so the createDirectories branch for pipeline dir is skipped - filesMockedStatic.when(() -> Files.exists(any(Path.class))).thenReturn(true); - - StageDTO newStage = pipelineDTO.getStages().get(0); - String path = pipelineFileService.createStageScriptFile(pipeline, newStage); - - // Parent directory exists – createDirectories should NOT be called - filesMockedStatic.verify(() -> Files.createDirectories(any(Path.class), any(FileAttribute.class)), times(0)); - filesMockedStatic.verify(() -> Files.createFile(any(Path.class), any(FileAttribute.class)), times(1)); - assert path != null && !path.isBlank(); - } - - @Test - public void testCreateLogFileWhenLogsDirectoryExists() throws IOException { - filesMockedStatic.when(() -> Files.exists(any(Path.class))).thenReturn(true); - - UUID pipelineBuildId = UUID.randomUUID(); - UUID stageBuildId = UUID.randomUUID(); - String logPath = pipelineFileService.createLogFile(pipelineBuildId, stageBuildId); - - // Both parent and build-logs directory already exist – no createDirectories - filesMockedStatic.verify(() -> Files.createDirectories(any(Path.class), any(FileAttribute.class)), times(0)); - filesMockedStatic.verify(() -> Files.createFile(any(Path.class), any(FileAttribute.class)), times(1)); - assert logPath != null && !logPath.isBlank(); - } } \ No newline at end of file From 6e344922a4c6eec0f6b55d9312ae37537cf8c7fd Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:25:44 +0530 Subject: [PATCH 10/21] Removed ngnix config --- pipeline-ui/nginx.conf | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 pipeline-ui/nginx.conf diff --git a/pipeline-ui/nginx.conf b/pipeline-ui/nginx.conf deleted file mode 100644 index f749e021..00000000 --- a/pipeline-ui/nginx.conf +++ /dev/null @@ -1,9 +0,0 @@ -server { - listen 80; - root /usr/share/nginx/html; - index index.html; - - location / { - try_files $uri $uri/ /index.html; - } -} From 352afc4904a65a5e7b7734fcd63389180e28bd10 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:27:20 +0530 Subject: [PATCH 11/21] Fixed the docker issues i --- docker-compose.yml | 26 +++++++++++++------------- pipeline/Dockerfile | 3 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 48fe5996..8d4fbc73 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,6 +67,12 @@ services: - "8016:8016" networks: - app + healthcheck: + test: ["CMD-SHELL", "wget -qO- http://localhost:8014/healthz || exit 1"] + interval: 5s + timeout: 3s + retries: 5 + start_period: 10s pipeline-app: build: context: . @@ -95,28 +101,22 @@ services: auth-service: condition: service_healthy flagd: - condition: service_started + condition: service_healthy pipeline-ui: build: - context: . - dockerfile: pipeline-ui/Dockerfile + context: ./pipeline-ui + dockerfile: Dockerfile args: - VITE_API_BASE_URL: http://localhost:8080/api/v1 + VITE_API_BASE_URL: http://pipeline-app:8080/api/v1 VITE_IDP: keycloak - VITE_KC_URL: http://localhost:8180 + VITE_KC_URL: http://auth-service:8080 VITE_KC_REALM: SpringBootRealm VITE_KC_CLIENTID: pipeline-app image: pipeline-ui - container_name: pipeline-ui ports: - - "3000:80" + - "3000:3000" networks: - app depends_on: pipeline-app: - condition: service_started - healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost:80"] - interval: 10s - timeout: 5s - retries: 3 \ No newline at end of file + condition: service_started \ No newline at end of file diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index fabafd88..1a128a37 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -16,8 +16,7 @@ RUN groupadd --system appgroup && useradd --system --gid appgroup appuser WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar COPY --from=build /home/app/target/agents/*.jar otel-agent.jar -RUN mkdir -p /pipeline_scripts /pipeline_build_logs \ - && chown -R appuser:appgroup /app /pipeline_scripts /pipeline_build_logs +RUN chown -R appuser:appgroup /app USER appuser EXPOSE 8080 ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] From 46d656d0ce13a73b740c9f8037d7a2370e5a02ac Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:36:34 +0530 Subject: [PATCH 12/21] Fixed the docker file --- docker-compose.yml | 12 +++--------- pipeline/Dockerfile | 5 +++-- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 8d4fbc73..2b31d402 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,12 +67,6 @@ services: - "8016:8016" networks: - app - healthcheck: - test: ["CMD-SHELL", "wget -qO- http://localhost:8014/healthz || exit 1"] - interval: 5s - timeout: 3s - retries: 5 - start_period: 10s pipeline-app: build: context: . @@ -91,8 +85,8 @@ services: ports: - "8080:8080" volumes: - - pipeline_scripts:/pipeline_scripts - - pipeline_build_logs:/pipeline_build_logs + - pipeline_scripts:/app/pipeline_scripts + - pipeline_build_logs:/app/pipeline_build_logs networks: - app depends_on: @@ -101,7 +95,7 @@ services: auth-service: condition: service_healthy flagd: - condition: service_healthy + condition: service_started pipeline-ui: build: context: ./pipeline-ui diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index 1a128a37..1a7c60d5 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -15,8 +15,9 @@ FROM eclipse-temurin:17-jre-jammy RUN groupadd --system appgroup && useradd --system --gid appgroup appuser WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar -COPY --from=build /home/app/target/agents/*.jar otel-agent.jar -RUN chown -R appuser:appgroup /app +COPY --from=build /home/app/target/agents/opentelemetry-javaagent.jar otel-agent.jar +RUN mkdir -p /pipeline_scripts /pipeline_build_logs \ + && chown -R appuser:appgroup /app /pipeline_scripts /pipeline_build_logs USER appuser EXPOSE 8080 ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] From c308b21da2d94bd78517e1e8c7b16ff6859da875 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 3 Nov 2026 10:40:43 +0530 Subject: [PATCH 13/21] Removed unused UUID import from LocalPipelineFileServiceImplTest --- .../utility/file/impl/LocalPipelineFileServiceImplTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java index f541f6b5..4d9b8654 100644 --- a/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java +++ b/pipeline/src/test/java/com/autobuild/pipeline/utility/file/impl/LocalPipelineFileServiceImplTest.java @@ -9,7 +9,6 @@ import java.nio.file.Path; import java.nio.file.attribute.FileAttribute; import java.util.List; -import java.util.UUID; import java.util.stream.Stream; import org.junit.jupiter.api.AfterEach; From 4b24276e11528724e6d8eff06c8c9ddf3eacdde2 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Thu, 5 Nov 2026 12:11:23 +0530 Subject: [PATCH 14/21] Updated .gitignore and Dockerfile and added .env --- .env.local | 9 ++++++++- pipeline-ui/.env | 5 +++++ pipeline-ui/.gitignore | 1 + pipeline-ui/Dockerfile | 10 +++++----- pipeline-ui/tsconfig.app.json | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 pipeline-ui/.env diff --git a/.env.local b/.env.local index 96e7df6e..81d3649b 100644 --- a/.env.local +++ b/.env.local @@ -11,4 +11,11 @@ DB_ROOT_PASSWORD=root # Leave empty to disable feature flags (all flags will evaluate to false). # For Docker: hardwired to http://flagd:8016 in docker-compose.yml. # flagd OFREP port is 8016; gRPC port is 8013. -FEATURE_PROVIDER_URI=http://localhost:8016 \ No newline at end of file +FEATURE_PROVIDER_URI=http://localhost:8016 + +# Pipeline UI (docker build args) +VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +VITE_IDP=keycloak +VITE_KC_URL=http://auth-service:8080 +VITE_KC_REALM=SpringBootRealm +VITE_KC_CLIENTID=pipeline-app \ No newline at end of file diff --git a/pipeline-ui/.env b/pipeline-ui/.env new file mode 100644 index 00000000..c75efeaf --- /dev/null +++ b/pipeline-ui/.env @@ -0,0 +1,5 @@ +VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +VITE_IDP=keycloak +VITE_KC_URL=http://auth-service:8080 +VITE_KC_REALM=SpringBootRealm +VITE_KC_CLIENTID=pipeline-app diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index 4335da9b..378cc896 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -26,3 +26,4 @@ coverage/* # Generated files src/gen + diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile index 72e6ae23..4b8e14ad 100644 --- a/pipeline-ui/Dockerfile +++ b/pipeline-ui/Dockerfile @@ -11,11 +11,11 @@ ARG VITE_IDP ARG VITE_KC_URL ARG VITE_KC_REALM ARG VITE_KC_CLIENTID -ENV VITE_API_BASE_URL=$VITE_API_BASE_URL -ENV VITE_IDP=$VITE_IDP -ENV VITE_KC_URL=$VITE_KC_URL -ENV VITE_KC_REALM=$VITE_KC_REALM -ENV VITE_KC_CLIENTID=$VITE_KC_CLIENTID +ENV VITE_API_BASE_URL=${VITE_API_BASE_URL} +ENV VITE_IDP=${VITE_IDP} +ENV VITE_KC_URL=${VITE_KC_URL} +ENV VITE_KC_REALM=${VITE_KC_REALM} +ENV VITE_KC_CLIENTID=${VITE_KC_CLIENTID} RUN npm run build # diff --git a/pipeline-ui/tsconfig.app.json b/pipeline-ui/tsconfig.app.json index 7e1ed649..10570b49 100644 --- a/pipeline-ui/tsconfig.app.json +++ b/pipeline-ui/tsconfig.app.json @@ -20,7 +20,7 @@ "strict": true, "noUnusedLocals": true, "noUnusedParameters": true, - "erasableSyntaxOnly": false, + "erasableSyntaxOnly": true, "noFallthroughCasesInSwitch": true, "noUncheckedSideEffectImports": true }, From 59c1d2cc725bd3db16dddeff856a1d37e85fe058 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 10 Nov 2026 11:36:32 +0530 Subject: [PATCH 15/21] Fixed the environment and docker --- .env.local | 15 +-------------- pipeline-ui/.env.local | 5 +++++ pipeline-ui/.gitignore | 1 + 3 files changed, 7 insertions(+), 14 deletions(-) create mode 100644 pipeline-ui/.env.local diff --git a/.env.local b/.env.local index 81d3649b..e0acd60e 100644 --- a/.env.local +++ b/.env.local @@ -5,17 +5,4 @@ DB_URL=jdbc:mysql://mysql-db:3306/pipeline?useSSL=false&allowPublicKeyRetrieval= DB_USERNAME=testuser DB_PASSWORD=testpass -DB_ROOT_PASSWORD=root - -# OpenFeature OFREP-compatible feature flag provider (e.g. flagd, Flagsmith). -# Leave empty to disable feature flags (all flags will evaluate to false). -# For Docker: hardwired to http://flagd:8016 in docker-compose.yml. -# flagd OFREP port is 8016; gRPC port is 8013. -FEATURE_PROVIDER_URI=http://localhost:8016 - -# Pipeline UI (docker build args) -VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 -VITE_IDP=keycloak -VITE_KC_URL=http://auth-service:8080 -VITE_KC_REALM=SpringBootRealm -VITE_KC_CLIENTID=pipeline-app \ No newline at end of file +DB_ROOT_PASSWORD=root \ No newline at end of file diff --git a/pipeline-ui/.env.local b/pipeline-ui/.env.local new file mode 100644 index 00000000..c75efeaf --- /dev/null +++ b/pipeline-ui/.env.local @@ -0,0 +1,5 @@ +VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +VITE_IDP=keycloak +VITE_KC_URL=http://auth-service:8080 +VITE_KC_REALM=SpringBootRealm +VITE_KC_CLIENTID=pipeline-app diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index 378cc896..ff0544b1 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -11,6 +11,7 @@ node_modules dist dist-ssr *.local +!.env.local coverage/* # Editor directories and files From c5f38aa78810dad6549448904d5f001f8de7e820 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Sat, 14 Nov 2026 10:41:58 +0530 Subject: [PATCH 16/21] Updated Dockerfile --- pipeline-ui/.env | 5 ----- pipeline-ui/.gitignore | 1 - pipeline-ui/Dockerfile | 10 +++++----- 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 pipeline-ui/.env diff --git a/pipeline-ui/.env b/pipeline-ui/.env deleted file mode 100644 index c75efeaf..00000000 --- a/pipeline-ui/.env +++ /dev/null @@ -1,5 +0,0 @@ -VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 -VITE_IDP=keycloak -VITE_KC_URL=http://auth-service:8080 -VITE_KC_REALM=SpringBootRealm -VITE_KC_CLIENTID=pipeline-app diff --git a/pipeline-ui/.gitignore b/pipeline-ui/.gitignore index ff0544b1..378cc896 100644 --- a/pipeline-ui/.gitignore +++ b/pipeline-ui/.gitignore @@ -11,7 +11,6 @@ node_modules dist dist-ssr *.local -!.env.local coverage/* # Editor directories and files diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile index 4b8e14ad..7e597905 100644 --- a/pipeline-ui/Dockerfile +++ b/pipeline-ui/Dockerfile @@ -6,11 +6,11 @@ WORKDIR /app COPY package*.json ./ RUN npm ci COPY . . -ARG VITE_API_BASE_URL -ARG VITE_IDP -ARG VITE_KC_URL -ARG VITE_KC_REALM -ARG VITE_KC_CLIENTID +ARG VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 +ARG VITE_IDP=keycloak +ARG VITE_KC_URL=http://auth-service:8080 +ARG VITE_KC_REALM=SpringBootRealm +ARG VITE_KC_CLIENTID=pipeline-app ENV VITE_API_BASE_URL=${VITE_API_BASE_URL} ENV VITE_IDP=${VITE_IDP} ENV VITE_KC_URL=${VITE_KC_URL} From b0611e768358dbf3d88a8cee18a3666225f7cc9b Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Tue, 17 Nov 2026 10:35:41 +0530 Subject: [PATCH 17/21] Fixed the comments and added them in the docs in .md file --- .env.local | 8 +++++++- .../setup/backend/running-backend-containers.md | 12 ++++++++++-- pipeline-ui/Dockerfile | 7 ++++++- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/.env.local b/.env.local index e0acd60e..96e7df6e 100644 --- a/.env.local +++ b/.env.local @@ -5,4 +5,10 @@ DB_URL=jdbc:mysql://mysql-db:3306/pipeline?useSSL=false&allowPublicKeyRetrieval= DB_USERNAME=testuser DB_PASSWORD=testpass -DB_ROOT_PASSWORD=root \ No newline at end of file +DB_ROOT_PASSWORD=root + +# OpenFeature OFREP-compatible feature flag provider (e.g. flagd, Flagsmith). +# Leave empty to disable feature flags (all flags will evaluate to false). +# For Docker: hardwired to http://flagd:8016 in docker-compose.yml. +# flagd OFREP port is 8016; gRPC port is 8013. +FEATURE_PROVIDER_URI=http://localhost:8016 \ No newline at end of file diff --git a/autobuild-docs/setup/backend/running-backend-containers.md b/autobuild-docs/setup/backend/running-backend-containers.md index 1e529dc9..64c0a5a4 100644 --- a/autobuild-docs/setup/backend/running-backend-containers.md +++ b/autobuild-docs/setup/backend/running-backend-containers.md @@ -4,7 +4,6 @@ From project root, build and start the application and database: ```bash -docker build -t pipeline-app . docker compose --env-file .env.local up -d ``` @@ -12,7 +11,6 @@ docker compose --env-file .env.local up -d Starts the app stack together with the full monitoring stack (Grafana, Loki, Prometheus, Alloy). All services start in dependency order automatically: ```bash -docker build -t pipeline-app . docker compose --env-file .env.local \ -f docker-compose.yml \ -f monitoring/docker-compose-monitoring.yml \ @@ -25,6 +23,16 @@ Monitoring UIs available at: - Alloy: http://localhost:12345 - Prometheus: http://localhost:9090 +## UI container only + +Build and run the UI container in isolation (build args default to the docker-compose values): +```bash +docker build -t pipeline-ui ./pipeline-ui +docker run -p 3000:3000 pipeline-ui +``` + +To override configuration, see `pipeline-ui/.env.local` for the available build args and their defaults. + ## Stopping ```bash diff --git a/pipeline-ui/Dockerfile b/pipeline-ui/Dockerfile index 7e597905..f57f9fd3 100644 --- a/pipeline-ui/Dockerfile +++ b/pipeline-ui/Dockerfile @@ -5,7 +5,12 @@ FROM node:22-alpine AS build WORKDIR /app COPY package*.json ./ RUN npm ci -COPY . . +COPY src ./src +COPY public ./public +COPY index.html . +COPY vite.config.ts . +COPY tsconfig*.json ./ +COPY tailwind.config.js postcss.config.js ./ ARG VITE_API_BASE_URL=http://pipeline-app:8080/api/v1 ARG VITE_IDP=keycloak ARG VITE_KC_URL=http://auth-service:8080 From a49b9c8f117f3425408f5fe66fa197c55b2c68d3 Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Wed, 18 Nov 2026 19:44:11 +0530 Subject: [PATCH 18/21] Simplify pipeline Dockerfile runtime stage Remove manual user/group creation and chown/mkdir steps per review feedback. --- pipeline/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index 1a7c60d5..2d70e6eb 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -12,12 +12,8 @@ RUN mvn clean package -DskipTests -Pmonitoring # Runtime stage # FROM eclipse-temurin:17-jre-jammy -RUN groupadd --system appgroup && useradd --system --gid appgroup appuser WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar COPY --from=build /home/app/target/agents/opentelemetry-javaagent.jar otel-agent.jar -RUN mkdir -p /pipeline_scripts /pipeline_build_logs \ - && chown -R appuser:appgroup /app /pipeline_scripts /pipeline_build_logs -USER appuser EXPOSE 8080 ENTRYPOINT ["java", "-javaagent:otel-agent.jar", "-jar", "app.jar"] From 49badc40cfaf825bbd69eecbb44b61e522e853fc Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Wed, 18 Nov 2026 19:46:38 +0530 Subject: [PATCH 19/21] fixed the DockerFile --- pipeline/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pipeline/Dockerfile b/pipeline/Dockerfile index 2d70e6eb..d53c01f7 100644 --- a/pipeline/Dockerfile +++ b/pipeline/Dockerfile @@ -11,7 +11,7 @@ RUN mvn clean package -DskipTests -Pmonitoring # # Runtime stage # -FROM eclipse-temurin:17-jre-jammy +FROM eclipse-temurin:17-jdk-jammy WORKDIR /app COPY --from=build /home/app/target/pipeline*.jar app.jar COPY --from=build /home/app/target/agents/opentelemetry-javaagent.jar otel-agent.jar From 2d7fb8ea72de8500ad25b6780532238d1caeaf0e Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Wed, 18 Nov 2026 19:54:52 +0530 Subject: [PATCH 20/21] Revert docs change: remove running-backend-containers.md from PR --- .../setup/backend/running-backend-containers.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/autobuild-docs/setup/backend/running-backend-containers.md b/autobuild-docs/setup/backend/running-backend-containers.md index 64c0a5a4..1e529dc9 100644 --- a/autobuild-docs/setup/backend/running-backend-containers.md +++ b/autobuild-docs/setup/backend/running-backend-containers.md @@ -4,6 +4,7 @@ From project root, build and start the application and database: ```bash +docker build -t pipeline-app . docker compose --env-file .env.local up -d ``` @@ -11,6 +12,7 @@ docker compose --env-file .env.local up -d Starts the app stack together with the full monitoring stack (Grafana, Loki, Prometheus, Alloy). All services start in dependency order automatically: ```bash +docker build -t pipeline-app . docker compose --env-file .env.local \ -f docker-compose.yml \ -f monitoring/docker-compose-monitoring.yml \ @@ -23,16 +25,6 @@ Monitoring UIs available at: - Alloy: http://localhost:12345 - Prometheus: http://localhost:9090 -## UI container only - -Build and run the UI container in isolation (build args default to the docker-compose values): -```bash -docker build -t pipeline-ui ./pipeline-ui -docker run -p 3000:3000 pipeline-ui -``` - -To override configuration, see `pipeline-ui/.env.local` for the available build args and their defaults. - ## Stopping ```bash From c271726f2ed6a11c09fb032518227b6caaf3349e Mon Sep 17 00:00:00 2001 From: Baibhab Dey Date: Wed, 18 Nov 2026 19:59:14 +0530 Subject: [PATCH 21/21] Add healthcheck to flagd using readyz endpoint and upgrade dependency condition to service_healthy --- docker-compose.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2b31d402..88c44c10 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -67,6 +67,12 @@ services: - "8016:8016" networks: - app + healthcheck: + test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/8014 && echo -e 'GET /readyz HTTP/1.1\\r\\nHost: localhost\\r\\nConnection: close\\r\\n\\r\\n' >&3 && grep -q 'HTTP/1.1 200' <&3"] + interval: 10s + timeout: 5s + retries: 3 + start_period: 10s pipeline-app: build: context: . @@ -95,7 +101,7 @@ services: auth-service: condition: service_healthy flagd: - condition: service_started + condition: service_healthy pipeline-ui: build: context: ./pipeline-ui