diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..03e9a08 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,2 @@ +# .dockerignore +quartz-manager-frontend/node_modules diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml index cdf26e4..33d4a9a 100644 --- a/.github/workflows/maven-release.yml +++ b/.github/workflows/maven-release.yml @@ -19,7 +19,7 @@ jobs: with: java-version: '11' distribution: 'temurin' - server-id: ossrh + server-id: maven-central-release server-username: MAVEN_USERNAME server-password: MAVEN_PASSWORD gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }} @@ -31,8 +31,8 @@ jobs: - name: Publish to maven central run: mvn deploy --file quartz-manager-parent/pom.xml --batch-mode -P "release-maven-central,build-webjar" env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} + MAVEN_USERNAME: ${{ secrets.MAVEN_CENTRAL_TOKEN_USERNAME }} + MAVEN_PASSWORD: ${{ secrets.MAVEN_CENTRAL_TOKEN_PASSWORD }} MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }} - name: Set up Java 11 for publishing to GitHub Packages diff --git a/.github/workflows/sonar-java.yml b/.github/workflows/sonar-java.yml index 2f5c885..cf43625 100644 --- a/.github/workflows/sonar-java.yml +++ b/.github/workflows/sonar-java.yml @@ -7,27 +7,28 @@ on: # paths: [ 'quartz-manager-parent/**' ] pull_request: types: [opened, synchronize, reopened] - + workflow_dispatch: jobs: build: name: Build and analyze runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - - name: Set up JDK 11 - uses: actions/setup-java@v1 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: - java-version: 11 + java-version: 17 + distribution: 'zulu' # Alternative distribution options are available. - name: Cache SonarCloud packages - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.sonar/cache key: ${{ runner.os }}-sonar restore-keys: ${{ runner.os }}-sonar - name: Cache Maven packages - uses: actions/cache@v1 + uses: actions/cache@v3 with: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} diff --git a/.gitignore b/.gitignore index d8fe4fa..6053dfb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /.project +.idea +*.iml diff --git a/CHANGELOG.md b/CHANGELOG.md index 63a7d1e..832fcc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## **v4.0.10** +Migrated to the new maven central repo + +## **v4.0.9** +Fixed a bug which prevented to run the liquibase migration scripts in case of usage of quartz-manager-starter-persistence + ## **v4.0.8** Upgraded the frontend to angular v14 diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..64c6968 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,34 @@ +FROM maven:3.9.8-eclipse-temurin-21 AS build + +# Set the working directory +WORKDIR /app + +# Copy the pom.xml and download dependencies +COPY quartz-manager-parent/pom.xml ./quartz-manager-parent/ +COPY quartz-manager-parent/lombok.config ./quartz-manager-parent/ +COPY quartz-manager-parent/quartz-manager-common ./quartz-manager-parent/quartz-manager-common/ +COPY quartz-manager-parent/quartz-manager-starter-api ./quartz-manager-parent/quartz-manager-starter-api/ +COPY quartz-manager-parent/quartz-manager-starter-persistence ./quartz-manager-parent/quartz-manager-starter-persistence/ +COPY quartz-manager-parent/quartz-manager-starter-security ./quartz-manager-parent/quartz-manager-starter-security/ +COPY quartz-manager-parent/quartz-manager-starter-ui ./quartz-manager-parent/quartz-manager-starter-ui/ +COPY quartz-manager-parent/quartz-manager-web-showcase ./quartz-manager-parent/quartz-manager-web-showcase/ +COPY quartz-manager-parent/lombok.config ./quartz-manager-parent/ +COPY quartz-manager-frontend ./quartz-manager-frontend/ +WORKDIR /app/quartz-manager-parent +RUN mvn clean package -DskipTests -P=build-webjar + + +# Stage 2: Create the final image +FROM openjdk:11-jre-slim + +# Set the working directory +WORKDIR /app + +# Copy the JAR file from the build stage +COPY --from=build /app/quartz-manager-parent/quartz-manager-web-showcase/target/*-SNAPSHOT.jar app.jar + +# Expose the application port +EXPOSE 8080 + +# Run the application +ENTRYPOINT ["java", "-jar", "app.jar"] diff --git a/README.md b/README.md index ecb28d7..ea01088 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ [![Maven Central](https://maven-badges.herokuapp.com/maven-central/it.fabioformosa.quartz-manager/quartz-manager-starter-api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/it.fabioformosa.quartz-manager/quartz-manager-starter-api) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=coverage)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=bugs)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager) [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager) [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=fabioformosa_quartz-manager&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=fabioformosa_quartz-manager) +# Table Of Contents + [QUARTZ MANAGER](https://github.com/fabioformosa/quartz-manager#quartz-manager)     [Quartz Manager UI](https://github.com/fabioformosa/quartz-manager#quartz-manager-ui) @@ -80,12 +82,12 @@ Add the dependency, make eligible for Quart Manager the job classes and set the it.fabioformosa.quartz-manager quartz-manager-starter-api - 4.0.8 + 4.0.9 ``` #### Gradle ``` -implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-api', version: '4.0.8' +implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-api', version: '4.0.9' ``` ### Step 2. Quartz Manager Job Classes @@ -168,12 +170,12 @@ You can optionally import the following dependency to have the UI Dashboard to i it.fabioformosa.quartz-manager quartz-manager-starter-ui - 4.0.8 + 4.0.9 ``` #### Gradle ``` -implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-ui', version: '4.0.8' +implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-ui', version: '4.0.9' ``` ### Reach out the UI Console at URL @@ -203,14 +205,14 @@ Future development: the Quart Manager Security OAuth2 client. it.fabioformosa.quartz-manager quartz-manager-starter-security - 4.0.8 + 4.0.9 ``` #### Gradle ``` -compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-security', version: '4.0.8' +compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-security', version: '4.0.9' ``` @@ -240,14 +242,14 @@ The pre-requesite is the availability of Postgresql database where Quartz Manage it.fabioformosa.quartz-manager quartz-manager-starter-persistence - 4.0.8 + 4.0.9 ``` #### Gradle ``` -compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-persistence', version: '4.0.8' +compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-persistence', version: '4.0.9' ``` ### Quartz Manager Persistence Lib - App Props @@ -269,6 +271,7 @@ You can find some examples of different scenarios of projects which import Quart * *existing-security-header-based* - It demonstrates how Quartz Manager Security can coexists with another Spring Security Config present in your project. Imported libraries: Quartz Manager API, Quartz Manager UI and Quartz Manager Security. * *existing-quartz* - It demonstrates how to Quartz Manager can coexist with a Quartz instance already present in your project Imported libraries: Quartz Manager API, Quartz Manager UI. * *existing-quartz-and-storage* - It demonstrates how to Quartz Manager Persistence can coexist with a Quartz instance already present in your project. Imported libraries: Quartz Manager API, Quartz Manager UI and Quartz Manager Persistence. +* *with-persistence* - It demonstrates how to import the Quartz Manager Persistence and get created the quartz tables automatically at the bootstrap ## Limitations diff --git a/cloudbuild.yaml b/cloudbuild.yaml new file mode 100644 index 0000000..bfa16d0 --- /dev/null +++ b/cloudbuild.yaml @@ -0,0 +1,45 @@ +substitutions: + _REGION: europe-west8 +steps: + + # Step 1: Google Cloud Build - Docker build&push + - name: 'gcr.io/k8s-skaffold/skaffold' + entrypoint: 'sh' + args: + - -xe + - -c + - | + # Build and push images + sed -i s/_IMAGE_TAG_POLICY/$SHORT_SHA/g skaffold.yaml + sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml + skaffold build --file-output=/workspace/artifacts.json \ + --default-repo=${_REGION}-docker.pkg.dev/quartz-manager-test/quartz-manager/quartz-manager-standalone \ + --push=true + + # Step 2: Google Cloud Deploy - deploy + - name: 'google/cloud-sdk:latest' + entrypoint: 'sh' + args: + - -xe + - -c + - | + sed -i s/_HELM_APP_VERSION/$SHORT_SHA/g ./quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml + gcloud config set deploy/region ${_REGION} + gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml + gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml + gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml + gcloud deploy apply --file ./quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml + gcloud deploy releases create rel-${SHORT_SHA} \ + --delivery-pipeline quartz-manager-pipeline \ + --description "$(git log -1 --pretty='%s')" \ + --build-artifacts /workspace/artifacts.json \ + --verbosity=debug \ + --annotations "commit_ui=https://source.cloud.google.com/$PROJECT_ID/quartz-manager-standalone/+/$COMMIT_SHA" +artifacts: + objects: + location: 'gs://$PROJECT_ID-gcdeploy-artifacts/' + paths: + - '/workspace/artifacts.json' + +options: + logging: CLOUD_LOGGING_ONLY diff --git a/quartz-manager-parent/README.md b/quartz-manager-parent/README.md index 4aed66c..f7b98d5 100644 --- a/quartz-manager-parent/README.md +++ b/quartz-manager-parent/README.md @@ -58,13 +58,13 @@ Replace the dummy job (class: `it.fabioformosa.quartzmanager.jobs.SampleJob`) wi **Backend Stack** Java 9, Spring Boot 2.5.6 (Spring MVC 5.3.12, Spring Security 5.5.3), Quartz Scheduler 2.3.2 -**Frontend** Angular 9.1.4, Web-Socket (stompjs 2.3.3) +**Frontend** Angular 14.2.12, Web-Socket (stompjs 2.3.3) -**Style** Angular Material 9, FontAwesome 5 +**Style** Angular Material 14, FontAwesome 5 Starting from Quartz Manager v2.x.x, the new structure of project is: * Multi-module maven project: REST API backend -* Angular 9: Single Page Application frontend +* Angular 14: Single Page Application frontend (The first version of quartz manager was a monolithic backend that provided also frontend developed with angularjs 1.6.x. You can find it at the branch 1.x.x) diff --git a/quartz-manager-parent/pom.xml b/quartz-manager-parent/pom.xml index 8794fae..15f0ba1 100644 --- a/quartz-manager-parent/pom.xml +++ b/quartz-manager-parent/pom.xml @@ -10,7 +10,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT pom @@ -43,6 +43,7 @@ 9 UTF-8 + 1.18.30 2.22.0 2.22.0 0.8.8 @@ -79,27 +80,32 @@ it.fabioformosa.quartz-manager quartz-manager-common - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-api - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-security - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-persistence - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-ui - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT + + + org.projectlombok + lombok + ${org.projectlombok.version} @@ -246,26 +252,25 @@ - ossrh - https://oss.sonatype.org/content/repositories/snapshots + maven-central-release + https://central.sonatype.com/repository/maven-snapshots/ - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - + maven-central-release + https://central.sonatype.com - org.sonatype.plugins - nexus-staging-maven-plugin - ${nexus-staging-maven-plugin.version} + org.sonatype.central + central-publishing-maven-plugin + 0.7.0 true - ossrh - https://oss.sonatype.org/ - true + maven-central-release + true + published diff --git a/quartz-manager-parent/quartz-manager-common/pom.xml b/quartz-manager-parent/quartz-manager-common/pom.xml index 8a82658..2eec18c 100644 --- a/quartz-manager-parent/quartz-manager-common/pom.xml +++ b/quartz-manager-parent/quartz-manager-common/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT quartz-manager-common diff --git a/quartz-manager-parent/quartz-manager-starter-api/pom.xml b/quartz-manager-parent/quartz-manager-starter-api/pom.xml index 60b66f7..557bc03 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-api/pom.xml @@ -5,7 +5,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT quartz-manager-starter-api diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java index 7d1fa85..3d64b25 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/configuration/SchedulerConfig.java @@ -55,7 +55,8 @@ public class SchedulerConfig { if (quartzProperties != null && quartzProperties.size() > 0) mergedProperties.putAll(quartzProperties); factory.setQuartzProperties(mergedProperties); - factory.setAutoStartup(false); + boolean isAutoStartup = mergedProperties.getProperty("org.quartz.scheduler.isAutoStartup") != null && mergedProperties.getProperty("org.quartz.scheduler.isAutoStartup").equals("true"); + factory.setAutoStartup(isAutoStartup); return factory; } } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java index 08cf37c..bea3bcf 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTrigger.java @@ -2,6 +2,7 @@ package it.fabioformosa.quartzmanager.api.converters; import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; +import org.quartz.JobDataMap; import org.quartz.SimpleScheduleBuilder; import org.quartz.SimpleTrigger; import org.quartz.Trigger; @@ -19,6 +20,8 @@ public class SimpleTriggerCommandDTOToSimpleTrigger implements Converter jobDataMap; } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java index f6182c2..0e1d772 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/api/dto/TriggerDTO.java @@ -4,6 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.quartz.JobDataMap; import java.util.Date; @@ -23,4 +24,5 @@ public class TriggerDTO { private JobKeyDTO jobKeyDTO; private JobDetailDTO jobDetailDTO; private boolean mayFireAgain; + private JobDataMap jobDataMap; } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java index a981950..01472e4 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/SimpleTriggerControllerTest.java @@ -21,7 +21,8 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import java.util.Date; - +import java.util.Map; +import static java.util.Map.entry; import static org.mockito.ArgumentMatchers.any; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*; @@ -68,6 +69,10 @@ class SimpleTriggerControllerTest { } private SimpleTriggerInputDTO buildACompleteSimpleTriggerCommandDTO() { + Map triggerJobDataMap = Map.ofEntries( + entry("customTriggerData1", "value1"), + entry("customTriggerData2", "value2") + ); return SimpleTriggerInputDTO.builder() .jobClass("it.fabioformosa.quartzmanager.api.jobs.SampleJob") .startDate(new Date()) @@ -75,6 +80,7 @@ class SimpleTriggerControllerTest { .misfireInstruction(MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW) .repeatCount(5) .repeatInterval(1000L * 60 * 60) + .jobDataMap(triggerJobDataMap) .build(); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java index caea6f0..4add372 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/controllers/utils/TriggerUtils.java @@ -2,12 +2,23 @@ package it.fabioformosa.quartzmanager.api.controllers.utils; import it.fabioformosa.quartzmanager.api.common.utils.DateUtils; import it.fabioformosa.quartzmanager.api.dto.*; +import org.quartz.JobDataMap; +import org.quartz.SimpleScheduleBuilder; +import org.quartz.SimpleTrigger; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.LocalDateTime; +import java.util.Date; +import java.util.Map; + +import static java.util.Map.entry; public class TriggerUtils { - static public TriggerDTO getTriggerInstance(String triggerName){ + static public TriggerDTO getTriggerInstance(String triggerName) { return TriggerDTO.builder() .description("sample trigger") .endTime(DateUtils.addHoursToNow(2L)) @@ -28,7 +39,7 @@ public class TriggerUtils { .build(); } - static public SimpleTriggerDTO getSimpleTriggerInstance(String triggerName, SimpleTriggerInputDTO simpleTriggerInputDTO){ + static public SimpleTriggerDTO getSimpleTriggerInstance(String triggerName, SimpleTriggerInputDTO simpleTriggerInputDTO) { return SimpleTriggerDTO.builder() .description("simple trigger") .repeatCount(simpleTriggerInputDTO.getRepeatCount()) @@ -48,10 +59,11 @@ public class TriggerUtils { .nextFireTime(DateUtils.addHoursToNow(1L)) .priority(1) .startTime(DateUtils.fromLocalDateTimeToDate(LocalDateTime.now())) + .jobDataMap(new JobDataMap(simpleTriggerInputDTO.getJobDataMap())) .build(); } - static public SimpleTriggerDTO getSimpleTriggerInstance(String triggerName){ + static public SimpleTriggerDTO getSimpleTriggerInstance(String triggerName) { return SimpleTriggerDTO.builder() .description("simple trigger") .repeatCount(2) @@ -71,6 +83,44 @@ public class TriggerUtils { .nextFireTime(DateUtils.addHoursToNow(1L)) .priority(1) .startTime(DateUtils.fromLocalDateTimeToDate(LocalDateTime.now())) + .jobDataMap(new JobDataMap(Map.ofEntries(entry("customTriggerData1", "value1")))) + .build(); + } + + static public SimpleTrigger buildSimpleTrigger() { + TriggerBuilder triggerTriggerBuilder = TriggerBuilder.newTrigger(); + triggerTriggerBuilder.startAt(new Date()); + triggerTriggerBuilder.endAt(DateUtils.addHoursToNow(1)); + triggerTriggerBuilder.usingJobData(new JobDataMap(Map.ofEntries(entry("data", "value")))); + + SimpleScheduleBuilder scheduleBuilder = SimpleScheduleBuilder.simpleSchedule(); + scheduleBuilder.withIntervalInMilliseconds(1000); + scheduleBuilder.withRepeatCount(1); + scheduleBuilder.withMisfireHandlingInstructionFireNow(); + + return triggerTriggerBuilder.withSchedule( + scheduleBuilder + ) + .withIdentity("simpleTrigger").build(); + } + + static public SimpleTriggerCommandDTO buildSimpleTriggerCommandDTO(String triggerName) throws ParseException { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date startDate = dateFormat.parse("2024-02-02"); + Date endDate = dateFormat.parse("2024-03-02"); + + SimpleTriggerInputDTO triggerInputDTO = SimpleTriggerInputDTO.builder() + .misfireInstruction(MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW) + .jobClass("sample.jobClass") + .repeatCount(1) + .repeatInterval(1000L) + .startDate(startDate) + .endDate(endDate) + .jobDataMap(Map.ofEntries(entry("data", "value"))) + .build(); + return SimpleTriggerCommandDTO.builder() + .triggerName(triggerName) + .simpleTriggerInputDTO(triggerInputDTO) .build(); } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTriggerTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTriggerTest.java new file mode 100644 index 0000000..63ba0cf --- /dev/null +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerCommandDTOToSimpleTriggerTest.java @@ -0,0 +1,41 @@ +package it.fabioformosa.quartzmanager.api.converters; + +import it.fabioformosa.quartzmanager.api.controllers.utils.TriggerUtils; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerCommandDTO; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.quartz.SimpleTrigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.convert.ConversionService; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@SpringBootTest +class SimpleTriggerCommandDTOToSimpleTriggerTest { + + @Autowired + private ConversionService conversionService; + + @Order(1) + @Test + void givenSimpleTriggerCommandDTO_whenItIsConverted_thenASimpleTriggerIsReturned() throws ParseException { + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + Date startDate = dateFormat.parse("2024-02-02"); + Date endDate = dateFormat.parse("2024-03-02"); + SimpleTriggerCommandDTO simpleTriggerCommandDTO = TriggerUtils.buildSimpleTriggerCommandDTO("mytrigger"); + SimpleTrigger simpleTrigger = conversionService.convert(simpleTriggerCommandDTO, SimpleTrigger.class); + Assertions.assertThat(simpleTrigger).isNotNull(); + Assertions.assertThat(simpleTrigger.getRepeatCount()).isEqualTo(simpleTriggerCommandDTO.getSimpleTriggerInputDTO().getRepeatCount()); + Assertions.assertThat(simpleTrigger.getRepeatInterval()).isEqualTo(simpleTriggerCommandDTO.getSimpleTriggerInputDTO().getRepeatInterval()); + Assertions.assertThat(simpleTrigger.getJobDataMap()).containsEntry("data", "value"); + Assertions.assertThat(simpleTrigger.getStartTime()).isEqualTo(startDate); + Assertions.assertThat(simpleTrigger.getEndTime()).isEqualTo(endDate); + } +} diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTOTest.java b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTOTest.java new file mode 100644 index 0000000..fa63edd --- /dev/null +++ b/quartz-manager-parent/quartz-manager-starter-api/src/test/java/it/fabioformosa/quartzmanager/api/converters/SimpleTriggerToSimpleTriggerDTOTest.java @@ -0,0 +1,36 @@ +package it.fabioformosa.quartzmanager.api.converters; + +import it.fabioformosa.quartzmanager.api.controllers.utils.TriggerUtils; +import it.fabioformosa.quartzmanager.api.dto.SimpleTriggerDTO; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.MethodOrderer; +import org.junit.jupiter.api.Order; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.TestMethodOrder; +import org.quartz.SimpleTrigger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.core.convert.ConversionService; + + +@TestMethodOrder(MethodOrderer.OrderAnnotation.class) +@SpringBootTest +class SimpleTriggerToSimpleTriggerDTOTest { + + @Autowired + private ConversionService conversionService; + + @Order(1) + @Test + void givenSimpleTrigger_whenItIsConverted_thenADtoIsReturned() { + SimpleTrigger simpleTrigger = TriggerUtils.buildSimpleTrigger(); + SimpleTriggerDTO simpleTriggerDTO = conversionService.convert(simpleTrigger, SimpleTriggerDTO.class); + Assertions.assertThat(simpleTriggerDTO).isNotNull(); + Assertions.assertThat(simpleTriggerDTO.getRepeatCount()).isEqualTo(simpleTrigger.getRepeatCount()); + Assertions.assertThat(simpleTriggerDTO.getRepeatInterval()).isEqualTo(simpleTrigger.getRepeatInterval()); + Assertions.assertThat(simpleTriggerDTO.getJobDataMap()).containsEntry("data", "value"); + Assertions.assertThat(simpleTriggerDTO.getStartTime()).isEqualTo(simpleTrigger.getStartTime()); + Assertions.assertThat(simpleTriggerDTO.getEndTime()).isEqualTo(simpleTrigger.getEndTime()); + } +} + diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml index 20c5b59..20811ef 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT quartz-manager-starter-persistence diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java index dada8bf..403d74f 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java +++ b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/java/it/fabioformosa/quartzmanager/api/persistence/PersistenceConfig.java @@ -11,7 +11,6 @@ import org.springframework.context.annotation.*; import javax.sql.DataSource; @Configuration -@PropertySource("classpath:quartz-persistence.properties") public class PersistenceConfig { @Value("${quartz-manager.persistence.quartz.datasource.url}") @@ -57,7 +56,7 @@ public class PersistenceConfig { @Primary @Bean - public DataSource quartzManagerDatasource(PersistenceDatasourceProps persistenceDatasourceProps) { + public DataSource quartzManagerDatasource() { return DataSourceBuilder.create() .url(quartzDatasourceUrl) .driverClassName("org.postgresql.Driver") diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/db/quartz-scheduler/liquibase-changelog-master.xml b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/db/quartz-scheduler/liquibase-changelog-master.xml index ad7fc84..ac2ea60 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/db/quartz-scheduler/liquibase-changelog-master.xml +++ b/quartz-manager-parent/quartz-manager-starter-persistence/src/main/resources/db/quartz-scheduler/liquibase-changelog-master.xml @@ -5,6 +5,6 @@ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.8.xsd"> - + diff --git a/quartz-manager-parent/quartz-manager-starter-security/pom.xml b/quartz-manager-parent/quartz-manager-starter-security/pom.xml index fbcc5c6..f69ee60 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-security/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT quartz-manager-starter-security diff --git a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml index 9575968..f72cd7f 100644 --- a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT quartz-manager-starter-ui diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml new file mode 100644 index 0000000..1883818 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/dev.yaml @@ -0,0 +1,9 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: Target +metadata: + name: dev + annotations: {} + labels: {} +description: dev +gke: + cluster: projects/quartz-manager-test/locations/europe-west8-a/clusters/gke-cluster diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml new file mode 100644 index 0000000..3d3c7fa --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/pipeline.yaml @@ -0,0 +1,18 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: DeliveryPipeline +metadata: + name: quartz-manager-pipeline + labels: + app: quartz-manager-standalone +description: quartz-manager-standalone delivery pipeline +serialPipeline: + stages: + - targetId: dev + profiles: + - dev + - targetId: staging + profiles: + - staging + - targetId: prod + profiles: + - prod diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml new file mode 100644 index 0000000..ea621a6 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/prod.yaml @@ -0,0 +1,10 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: Target +metadata: + name: prod + annotations: {} + labels: {} +description: prod +requireApproval: true +gke: + cluster: projects/quartz-manager-test/locations/europe-west8-a/clusters/gke-cluster diff --git a/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml b/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml new file mode 100644 index 0000000..ecaf3a7 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/deploy/staging.yaml @@ -0,0 +1,10 @@ +apiVersion: deploy.cloud.google.com/v1 +kind: Target +metadata: + name: staging + annotations: {} + labels: {} +description: staging +requireApproval: true +gke: + cluster: projects/quartz-manager-test/locations/europe-west8-a/clusters/gke-cluster diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml new file mode 100644 index 0000000..5a63105 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/Chart.yaml @@ -0,0 +1,24 @@ +apiVersion: v2 +name: quartz-manager-standalone +description: A Helm chart for Kubernetes + + +# A chart can be either an 'application' or a 'library' chart. +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 1.0.0 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "_HELM_APP_VERSION" diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/NOTES.txt b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/NOTES.txt new file mode 100644 index 0000000..d432c5c --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/NOTES.txt @@ -0,0 +1,22 @@ +1. Get the application URL by running these commands: +{{- if .Values.ingress.enabled }} +{{- range $host := .Values.ingress.hosts }} + {{- range .paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }} + {{- end }} +{{- end }} +{{- else if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "quartzmanager-standalone.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "quartzmanager-standalone.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "quartzmanager-standalone.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo http://$SERVICE_IP:{{ .Values.service.port }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "quartzmanager-standalone.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}") + export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT +{{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/_helpers.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/_helpers.yaml new file mode 100644 index 0000000..59d7d95 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/_helpers.yaml @@ -0,0 +1,62 @@ +{{/* +Expand the name of the chart. +*/}} +{{- define "quartzmanager-standalone.name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Create a default fully qualified app name. +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. +*/}} +{{- define "quartzmanager-standalone.fullname" -}} +{{- if .Values.fullnameOverride }} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- $name := default .Chart.Name .Values.nameOverride }} +{{- if contains $name .Release.Name }} +{{- .Release.Name | trunc 63 | trimSuffix "-" }} +{{- else }} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} +{{- end }} +{{- end }} +{{- end }} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "quartzmanager-standalone.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} +{{- end }} + +{{/* +Common labels +*/}} +{{- define "quartzmanager-standalone.labels" -}} +helm.sh/chart: {{ include "quartzmanager-standalone.chart" . }} +{{ include "quartzmanager-standalone.selectorLabels" . }} +{{- if .Chart.AppVersion }} +app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} +{{- end }} +app.kubernetes.io/managed-by: {{ .Release.Service }} +{{- end }} + +{{/* +Selector labels +*/}} +{{- define "quartzmanager-standalone.selectorLabels" -}} +app.kubernetes.io/name: {{ include "quartzmanager-standalone.name" . }} +app.kubernetes.io/instance: {{ .Release.Name }} +{{- end }} + +{{/* +Create the name of the service account to use +*/}} +{{- define "quartzmanager-standalone.serviceAccountName" -}} +{{- if .Values.serviceAccount.create }} +{{- default (include "quartzmanager-standalone.fullname" .) .Values.serviceAccount.name }} +{{- else }} +{{- default "default" .Values.serviceAccount.name }} +{{- end }} +{{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/configmap.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/configmap.yaml new file mode 100644 index 0000000..aa87e0a --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/configmap.yaml @@ -0,0 +1,9 @@ +apiVersion: "v1" +kind: "ConfigMap" +metadata: + name: {{ include "quartzmanager-standalone.fullname" . }} + namespace: {{ .Release.Namespace }} + labels: + app: {{ .Chart.Name }} +data: + envName: {{ .Values.config.envName | quote }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/deployment.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/deployment.yaml new file mode 100644 index 0000000..760aeea --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/deployment.yaml @@ -0,0 +1,68 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ include "quartzmanager-standalone.fullname" . }} + labels: + {{- include "quartzmanager-standalone.labels" . | nindent 4 }} +spec: + {{- if not .Values.autoscaling.enabled }} + replicas: {{ .Values.replicaCount }} + {{- end }} + selector: + matchLabels: + {{- include "quartzmanager-standalone.selectorLabels" . | nindent 6 }} + template: + metadata: + {{- with .Values.podAnnotations }} + annotations: + {{- toYaml . | nindent 8 }} + {{- end }} + labels: + {{- include "quartzmanager-standalone.selectorLabels" . | nindent 8 }} + spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} + serviceAccountName: {{ include "quartzmanager-standalone.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: http + containerPort: {{ .Values.service.port }} + protocol: TCP +{{/* livenessProbe:*/}} +{{/* initialDelaySeconds: 30*/}} +{{/* timeoutSeconds: 10*/}} +{{/* httpGet:*/}} +{{/* path: /*/}} +{{/* port: 8080*/}} +{{/* readinessProbe:*/}} +{{/* initialDelaySeconds: 30*/}} +{{/* timeoutSeconds: 10*/}} +{{/* httpGet:*/}} +{{/* path: /*/}} +{{/* port: 8080*/}} + resources: + {{- toYaml .Values.resources | nindent 12 }} + envFrom: + - configMapRef: + name: {{ include "quartzmanager-standalone.fullname" . }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/hpa.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/hpa.yaml new file mode 100644 index 0000000..67973b7 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/hpa.yaml @@ -0,0 +1,28 @@ +{{- if .Values.autoscaling.enabled }} +apiVersion: autoscaling/v2beta1 +kind: HorizontalPodAutoscaler +metadata: + name: {{ include "quartzmanager-standalone.fullname" . }} + labels: + {{- include "quartzmanager-standalone.labels" . | nindent 4 }} +spec: + scaleTargetRef: + apiVersion: apps/v1 + kind: Deployment + name: {{ include "quartzmanager-standalone.fullname" . }} + minReplicas: {{ .Values.autoscaling.minReplicas }} + maxReplicas: {{ .Values.autoscaling.maxReplicas }} + metrics: + {{- if .Values.autoscaling.targetCPUUtilizationPercentage }} + - type: Resource + resource: + name: cpu + targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }} + {{- end }} + {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }} + - type: Resource + resource: + name: memory + targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }} + {{- end }} +{{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/ingress.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/ingress.yaml new file mode 100644 index 0000000..46de18b --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/ingress.yaml @@ -0,0 +1,61 @@ +{{- if .Values.ingress.enabled -}} +{{- $fullName := include "quartzmanager-standalone.fullname" . -}} +{{- $svcPort := .Values.service.port -}} +{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }} + {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }} + {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className}} + {{- end }} +{{- end }} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1beta1 +{{- else -}} +apiVersion: extensions/v1beta1 +{{- end }} +kind: Ingress +metadata: + name: {{ $fullName }} + labels: + {{- include "quartzmanager-standalone.labels" . | nindent 4 }} + {{- with .Values.ingress.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +spec: + {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} + ingressClassName: {{ .Values.ingress.className }} + {{- end }} + {{- if .Values.ingress.tls }} + tls: + {{- range .Values.ingress.tls }} + - hosts: + {{- range .hosts }} + - {{ . | quote }} + {{- end }} + secretName: {{ .secretName }} + {{- end }} + {{- end }} + rules: + {{- range .Values.ingress.hosts }} + - host: {{ .host | quote }} + http: + paths: + {{- range .paths }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} + backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} + serviceName: {{ $fullName }} + servicePort: {{ $svcPort }} + {{- end }} + {{- end }} + {{- end }} +{{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/service.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/service.yaml new file mode 100644 index 0000000..96bcb76 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/service.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ include "quartzmanager-standalone.fullname" . }} + labels: + {{- include "quartzmanager-standalone.labels" . | nindent 4 }} +spec: + type: {{ .Values.service.type }} + ports: + - port: {{ .Values.service.port }} + targetPort: http + protocol: TCP + name: http + selector: + {{- include "quartzmanager-standalone.selectorLabels" . | nindent 4 }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/serviceaccount.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/serviceaccount.yaml new file mode 100644 index 0000000..6e11e89 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/templates/serviceaccount.yaml @@ -0,0 +1,12 @@ +{{- if .Values.serviceAccount.create -}} +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ include "quartzmanager-standalone.serviceAccountName" . }} + labels: + {{- include "quartzmanager-standalone.labels" . | nindent 4 }} + {{- with .Values.serviceAccount.annotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} +{{- end }} diff --git a/quartz-manager-parent/quartz-manager-web-showcase/helm/values.yaml b/quartz-manager-parent/quartz-manager-web-showcase/helm/values.yaml new file mode 100644 index 0000000..dab99e5 --- /dev/null +++ b/quartz-manager-parent/quartz-manager-web-showcase/helm/values.yaml @@ -0,0 +1,83 @@ +# Default values for hello-world. +# This is a YAML-formatted file. +# Declare variables to be passed into your templates. + +replicaCount: 1 + +image: + repository: "europe-west8-docker.pkg.dev/quartz-manager-test/quartz-manager/quartz-manager-standalone/quartz-manager-standalone" + pullPolicy: IfNotPresent + +imagePullSecrets: [] +nameOverride: "" +fullnameOverride: "" + +serviceAccount: + # Specifies whether a service account should be created + create: false + # Annotations to add to the service account + annotations: {} + # The name of the service account to use. + # If not set and create is true, a name is generated using the fullname template + name: "" + +podAnnotations: {} + +podSecurityContext: {} +# fsGroup: 2000 + +securityContext: {} + # capabilities: + # drop: + # - ALL + # readOnlyRootFilesystem: true +# runAsNonRoot: true +# runAsUser: 1000 + +service: + type: ClusterIP + port: 8080 + +ingress: + enabled: false + className: "" + annotations: {} + # kubernetes.io/ingress.class: nginx + # kubernetes.io/tls-acme: "true" + hosts: + - host: chart-example.local + paths: + - path: / + pathType: ImplementationSpecific + tls: [] + # - secretName: chart-example-tls + # hosts: + # - chart-example.local + +resources: {} + # We usually recommend not to specify default resources and to leave this as a conscious + # choice for the user. This also increases chances charts run on environments with little + # resources, such as Minikube. If you do want to specify resources, uncomment the following + # lines, adjust them as necessary, and remove the curly braces after 'resources:'. + # limits: + # cpu: 100m + # memory: 128Mi + # requests: +# cpu: 100m +# memory: 128Mi + +autoscaling: + enabled: false + minReplicas: 1 + maxReplicas: 100 + targetCPUUtilizationPercentage: 80 + # targetMemoryUtilizationPercentage: 80 + +nodeSelector: {} + +tolerations: [] + +affinity: {} + +config: + envName: NA diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml index d2d1ce0..0d80c5a 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml +++ b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml @@ -5,12 +5,12 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.9-SNAPSHOT + 4.0.11-SNAPSHOT - quartz-manager-web-showcase + jar - war + quartz-manager-web-showcase Quartz Manager Web Showcase A webapp that imports Quartz Manager API lib and the frontend webjar @@ -49,15 +49,10 @@ org.springframework.boot spring-boot-devtools - - org.springframework.boot - spring-boot-configuration-processor - true - - + org.springframework.boot - spring-boot-starter-tomcat - provided + spring-boot-configuration-processor + true org.springframework.boot @@ -123,30 +118,28 @@ - - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.0 - - 9 - 9 - - - - + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.0 + + 9 + 9 + + + diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java b/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java deleted file mode 100644 index dcc3414..0000000 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/java/it/fabioformosa/ServletInitializer.java +++ /dev/null @@ -1,21 +0,0 @@ -package it.fabioformosa; - -import lombok.Generated; -import org.springframework.boot.builder.SpringApplicationBuilder; -import org.springframework.boot.web.servlet.support.SpringBootServletInitializer; - -/** - * ServletInitializer needs to deploy quartz-manager into a servlet container as a war file - * - * @author Fabio Formosa - * - */ -@Generated -public class ServletInitializer extends SpringBootServletInitializer { - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(QuartzManagerDemoApplication.class); - } - -} diff --git a/skaffold.yaml b/skaffold.yaml new file mode 100644 index 0000000..035e751 --- /dev/null +++ b/skaffold.yaml @@ -0,0 +1,46 @@ +apiVersion: skaffold/v4beta7 +kind: Config +build: + tagPolicy: + envTemplate: + template: "_IMAGE_TAG_POLICY" + artifacts: + - image: quartz-manager-standalone + context: ./ +profiles: + - name: dev + deploy: + helm: + releases: + - name: quartzmanager-standalone + createNamespace: true + namespace: quartzmanager-dev + chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm +# valuesFiles: +# - helm/envs/dev/values.yaml + setValueTemplates: + image.tag: "_IMAGE_TAG_POLICY" + - name: staging + deploy: + helm: + releases: + - name: quartzmanager-standalone + createNamespace: true + namespace: quartzmanager-staging + chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm + # valuesFiles: + # - helm/envs/dev/values.yaml + setValueTemplates: + image.tag: "_IMAGE_TAG_POLICY" + - name: prod + deploy: + helm: + releases: + - name: quartzmanager-standalone + createNamespace: true + namespace: quartzmanager-prod + chartPath: quartz-manager-parent/quartz-manager-web-showcase/helm + # valuesFiles: + # - helm/envs/dev/values.yaml + setValueTemplates: + image.tag: "_IMAGE_TAG_POLICY"