Skip to content

Commit

Permalink
feat: PROMOTE TO UAT (#16)
Browse files Browse the repository at this point in the history
  • Loading branch information
antocalo authored Dec 12, 2024
2 parents e1aaa83 + 700c5e2 commit 703e34c
Show file tree
Hide file tree
Showing 32 changed files with 2,053 additions and 29 deletions.
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,10 @@ RUN gradle openApiGeneratePayhub dependencies --no-daemon

RUN gradle openApiGeneratePdndClient dependencies --no-daemon

RUN gradle openApiGenerateAnprApiC030 dependencies --no-daemon

RUN gradle openApiGenerateAnprApiC003 dependencies --no-daemon

#
# 🏗️ Build Stage
#
Expand Down
52 changes: 48 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ val nimbusJoseJwtVersion = "9.47"
val jjwtVersion = "0.12.6"
val wiremockVersion = "3.9.2"
val wiremockSpringBootVersion = "2.1.3"
val micrometerVersion = "1.4.0"

dependencies {
implementation("org.springframework.boot:spring-boot-starter")
Expand All @@ -47,16 +48,17 @@ dependencies {
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
implementation("org.openapitools:jackson-databind-nullable:$openApiToolsVersion")
implementation("com.google.code.findbugs:jsr305:$findbugsVersion")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")
implementation("io.micrometer:micrometer-tracing-bridge-otel:$micrometerVersion")

// validation token jwt
implementation("com.auth0:java-jwt:$javaJwtVersion")
implementation("com.auth0:jwks-rsa:$jwksRsaVersion")
implementation("com.nimbusds:nimbus-jose-jwt:$nimbusJoseJwtVersion")
implementation("io.jsonwebtoken:jjwt-api:$jjwtVersion")

compileOnly("org.projectlombok:lombok")
annotationProcessor("org.projectlombok:lombok")

// Testing
testImplementation("org.springframework.boot:spring-boot-starter-test")
testImplementation("org.springframework.security:spring-security-test")
Expand Down Expand Up @@ -98,7 +100,7 @@ configurations {
}

tasks.compileJava {
dependsOn("openApiGeneratePayhub","openApiGeneratePdndClient")
dependsOn("openApiGeneratePayhub","openApiGeneratePdndClient","openApiGenerateAnprApiC030", "openApiGenerateAnprApiC003")
}

configure<SourceSetContainer> {
Expand Down Expand Up @@ -154,4 +156,46 @@ tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("ope
"generateSupportingFiles" to "true"
))
library.set("resttemplate")
}

tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGenerateAnprApiC030") {
group = "openapi"
description = "description"

generatorName.set("spring")
inputSpec.set("$rootDir/openapi/anprApiC030.openapi.yaml")
outputDir.set("$projectDir/build/generated")
apiPackage.set("it.gov.pagopa.payhub.anpr.C030.controller.generated")
modelPackage.set("it.gov.pagopa.payhub.anpr.C030.model.generated")
configOptions.set(mapOf(
"dateLibrary" to "java8",
"requestMappingMode" to "api_interface",
"useSpringBoot3" to "true",
"interfaceOnly" to "true",
"useTags" to "true",
"generateConstructorWithAllArgs" to "false",
"generatedConstructorWithRequiredArgs" to "false",
"additionalModelTypeAnnotations" to "@lombok.Data;@lombok.Builder;@lombok.NoArgsConstructor;@lombok.AllArgsConstructor"
))
}

tasks.register<org.openapitools.generator.gradle.plugin.tasks.GenerateTask>("openApiGenerateAnprApiC003") {
group = "openapi"
description = "description"

generatorName.set("spring")
inputSpec.set("$rootDir/openapi/anprApiC003.openapi.yaml")
outputDir.set("$projectDir/build/generated")
apiPackage.set("it.gov.pagopa.payhub.anpr.C003.controller.generated")
modelPackage.set("it.gov.pagopa.payhub.anpr.C003.model.generated")
configOptions.set(mapOf(
"dateLibrary" to "java8",
"requestMappingMode" to "api_interface",
"useSpringBoot3" to "true",
"interfaceOnly" to "true",
"useTags" to "true",
"generateConstructorWithAllArgs" to "false",
"generatedConstructorWithRequiredArgs" to "false",
"additionalModelTypeAnnotations" to "@lombok.Data;@lombok.Builder;@lombok.NoArgsConstructor;@lombok.AllArgsConstructor"
))
}
15 changes: 15 additions & 0 deletions gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
aopalliance:aopalliance:1.0=compileClasspath
ch.qos.logback:logback-classic:1.5.11=compileClasspath
ch.qos.logback:logback-core:1.5.11=compileClasspath
com.auth0:java-jwt:4.4.0=compileClasspath
Expand All @@ -16,10 +17,24 @@ com.fasterxml.jackson:jackson-bom:2.17.2=compileClasspath
com.google.code.findbugs:jsr305:3.0.2=compileClasspath
com.nimbusds:nimbus-jose-jwt:9.47=compileClasspath
io.jsonwebtoken:jjwt-api:0.12.6=compileClasspath
io.micrometer:context-propagation:1.1.2=compileClasspath
io.micrometer:micrometer-commons:1.13.6=compileClasspath
io.micrometer:micrometer-core:1.13.6=compileClasspath
io.micrometer:micrometer-jakarta9:1.13.6=compileClasspath
io.micrometer:micrometer-observation:1.13.6=compileClasspath
io.micrometer:micrometer-tracing-bridge-otel:1.4.0=compileClasspath
io.micrometer:micrometer-tracing:1.3.5=compileClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.9.0-alpha=compileClasspath
io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.9.0=compileClasspath
io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha=compileClasspath
io.opentelemetry:opentelemetry-api:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-context:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-extension-trace-propagators:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-sdk-common:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-sdk-logs:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-sdk-metrics:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-sdk-trace:1.37.0=compileClasspath
io.opentelemetry:opentelemetry-sdk:1.37.0=compileClasspath
io.swagger.core.v3:swagger-annotations-jakarta:2.2.22=compileClasspath
io.swagger.core.v3:swagger-core-jakarta:2.2.22=compileClasspath
io.swagger.core.v3:swagger-models-jakarta:2.2.22=compileClasspath
Expand Down
2 changes: 2 additions & 0 deletions helm/values-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ microservice-chart:
PDND_SERVICE_ANPR_C003_PURPOSE_ID: 5ba1f38f-6a91-4da4-8a42-4da1aa55bfee
PDND_SERVICE_ANPR_C030_PURPOSE_ID: 87520bd5-207a-4616-85d9-10d7bb3e88b8

ANPR_BASE_URL: http://p4pa-mocks-microservice-chart:8080

keyvault:
name: "p4pa-d-payhub-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
2 changes: 2 additions & 0 deletions helm/values-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ microservice-chart:
PDND_SERVICE_ANPR_C003_PURPOSE_ID: 5ba1f38f-6a91-4da4-8a42-4da1aa55bfee
PDND_SERVICE_ANPR_C030_PURPOSE_ID: 87520bd5-207a-4616-85d9-10d7bb3e88b8

ANPR_BASE_URL: http://p4pa-mocks-microservice-chart:8080

keyvault:
name: "p4pa-p-payhub-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
2 changes: 2 additions & 0 deletions helm/values-uat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ microservice-chart:
PDND_SERVICE_ANPR_C003_PURPOSE_ID: 5ba1f38f-6a91-4da4-8a42-4da1aa55bfee
PDND_SERVICE_ANPR_C030_PURPOSE_ID: 87520bd5-207a-4616-85d9-10d7bb3e88b8

ANPR_BASE_URL: http://p4pa-mocks-microservice-chart:8080

keyvault:
name: "p4pa-u-payhub-kv"
tenantId: "7788edaf-0346-4068-9d79-c868aed15b3d"
Loading

0 comments on commit 703e34c

Please sign in to comment.