From 4dd8cc959fe8c34a1fb58f61bb9a3b7c76e3ad39 Mon Sep 17 00:00:00 2001 From: Ole Anders Eidjord Date: Mon, 15 Apr 2024 16:02:18 +0200 Subject: [PATCH] ARKIV-260 Rename everything to VIGO --- Dockerfile | 2 +- kustomize/base/flais.yaml | 8 ++++---- kustomize/base/kustomization.yaml | 2 +- kustomize/base/oauth2-oppfolgingstjenesten-client.yaml | 6 +++--- kustomize/overlays/fintlabs-no/beta/kustomization.yaml | 6 +++--- kustomize/overlays/ofk-no/beta/kustomization.yaml | 6 +++--- settings.gradle | 2 +- .../instance/gateway/IncomingInstanceMappingService.java | 2 +- .../no/fintlabs/instance/gateway/InstanceController.java | 2 +- .../instance/gateway/InstanceProcessorConfiguration.java | 2 +- .../model/{oppfolgingstjenesten => vigo}/Dokument.java | 2 +- .../{oppfolgingstjenesten => vigo}/IncomingInstance.java | 2 +- .../{oppfolgingstjenesten => vigo}/Inntaksadresse.java | 2 +- .../Kontaktinformasjon.java | 2 +- .../model/{oppfolgingstjenesten => vigo}/Personalia.java | 2 +- src/main/resources/application.yaml | 2 +- 16 files changed, 25 insertions(+), 25 deletions(-) rename src/main/java/no/fintlabs/instance/gateway/model/{oppfolgingstjenesten => vigo}/Dokument.java (86%) rename src/main/java/no/fintlabs/instance/gateway/model/{oppfolgingstjenesten => vigo}/IncomingInstance.java (88%) rename src/main/java/no/fintlabs/instance/gateway/model/{oppfolgingstjenesten => vigo}/Inntaksadresse.java (81%) rename src/main/java/no/fintlabs/instance/gateway/model/{oppfolgingstjenesten => vigo}/Kontaktinformasjon.java (80%) rename src/main/java/no/fintlabs/instance/gateway/model/{oppfolgingstjenesten => vigo}/Personalia.java (83%) diff --git a/Dockerfile b/Dockerfile index 432a69f..09bb9a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,5 +5,5 @@ RUN gradle --no-daemon build FROM gcr.io/distroless/java17 ENV JAVA_TOOL_OPTIONS -XX:+ExitOnOutOfMemoryError -COPY --from=builder /home/gradle/build/libs/fint-flyt-oppfolgingstjenesten-gateway-*.jar /data/app.jar +COPY --from=builder /home/gradle/build/libs/fint-flyt-vigo-gateway-*.jar /data/app.jar CMD ["/data/app.jar"] diff --git a/kustomize/base/flais.yaml b/kustomize/base/flais.yaml index 84e200d..46cc7c0 100644 --- a/kustomize/base/flais.yaml +++ b/kustomize/base/flais.yaml @@ -1,11 +1,11 @@ apiVersion: fintlabs.no/v1alpha1 kind: Application metadata: - name: fint-flyt-oppfolgingstjenesten-gateway + name: fint-flyt-vigo-gateway namespace: fintlabs-no labels: - app.kubernetes.io/name: fint-flyt-oppfolgingstjenesten-gateway - app.kubernetes.io/instance: fint-flyt-oppfolgingstjenesten-gateway_fintlabs_no + app.kubernetes.io/name: fint-flyt-vigo-gateway + app.kubernetes.io/instance: fint-flyt-vigo-gateway_fintlabs_no app.kubernetes.io/version: latest app.kubernetes.io/component: backend app.kubernetes.io/part-of: fint-flyt @@ -15,7 +15,7 @@ spec: port: 8080 imagePullPolicy: Always orgId: fintlabs.no - image: ghcr.io/fintlabs/fint-flyt-oppfolgingstjenesten-gateway:sha-0000000 + image: ghcr.io/fintlabs/fint-flyt-vigo-gateway:sha-0000000 kafka: enabled: true acls: diff --git a/kustomize/base/kustomization.yaml b/kustomize/base/kustomization.yaml index 0a1d4c8..043ad07 100644 --- a/kustomize/base/kustomization.yaml +++ b/kustomize/base/kustomization.yaml @@ -3,4 +3,4 @@ kind: Kustomization resources: - flais.yaml - oauth2-file-client.yaml - - oauth2-oppfolgingstjenesten-client.yaml \ No newline at end of file + - oauth2-vigo-client.yaml \ No newline at end of file diff --git a/kustomize/base/oauth2-oppfolgingstjenesten-client.yaml b/kustomize/base/oauth2-oppfolgingstjenesten-client.yaml index 5861e41..69b0608 100644 --- a/kustomize/base/oauth2-oppfolgingstjenesten-client.yaml +++ b/kustomize/base/oauth2-oppfolgingstjenesten-client.yaml @@ -1,9 +1,9 @@ apiVersion: "fintlabs.no/v1alpha1" kind: NamOAuthClientApplicationResource metadata: - name: fint-flyt-oppfolgingstjenesten-oauth2-client + name: fint-flyt-vigo-oauth2-client spec: - clientIdProperty: fint.flyt.oppfolgingstjenesten.sso.client-id - clientSecretProperty: fint.flyt.oppfolgingstjenesten.sso.client-secret + clientIdProperty: fint.flyt.vigo.sso.client-id + clientSecretProperty: fint.flyt.vigo.sso.client-secret grantTypes: - client_credentials \ No newline at end of file diff --git a/kustomize/overlays/fintlabs-no/beta/kustomization.yaml b/kustomize/overlays/fintlabs-no/beta/kustomization.yaml index 6db1267..c60581c 100644 --- a/kustomize/overlays/fintlabs-no/beta/kustomization.yaml +++ b/kustomize/overlays/fintlabs-no/beta/kustomization.yaml @@ -6,7 +6,7 @@ resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-oppfolgingstjenesten-gateway_fintlabs_no + app.kubernetes.io/instance: fint-flyt-vigo-gateway_fintlabs_no fintlabs.no/org-id: fintlabs.no patches: @@ -22,8 +22,8 @@ patches: value: "/beta/fintlabs-no" - op: replace path: "/spec/ingress/basePath" - value: "/beta/fintlabs-no/api/oppfolgingstjenesten" + value: "/beta/fintlabs-no/api/vigo" target: kind: Application - name: fint-flyt-oppfolgingstjenesten-gateway + name: fint-flyt-vigo-gateway diff --git a/kustomize/overlays/ofk-no/beta/kustomization.yaml b/kustomize/overlays/ofk-no/beta/kustomization.yaml index bffcc86..050b7cb 100644 --- a/kustomize/overlays/ofk-no/beta/kustomization.yaml +++ b/kustomize/overlays/ofk-no/beta/kustomization.yaml @@ -6,7 +6,7 @@ resources: - ../../../base commonLabels: - app.kubernetes.io/instance: fint-flyt-oppfolgingstjenesten-gateway_ofk_no + app.kubernetes.io/instance: fint-flyt-vigo-gateway_ofk_no fintlabs.no/org-id: ofk.no patches: @@ -22,8 +22,8 @@ patches: value: "/beta/ofk-no" - op: replace path: "/spec/ingress/basePath" - value: "/beta/ofk-no/api/oppfolgingstjenesten" + value: "/beta/ofk-no/api/vigo" target: kind: Application - name: fint-flyt-oppfolgingstjenesten-gateway + name: fint-flyt-vigo-gateway diff --git a/settings.gradle b/settings.gradle index ccaf2c8..7ab304e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -rootProject.name = 'fint-flyt-oppfolgingstjenesten-gateway' +rootProject.name = 'fint-flyt-vigo-gateway' diff --git a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java index 0de4dc2..edc825e 100644 --- a/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java +++ b/src/main/java/no/fintlabs/instance/gateway/IncomingInstanceMappingService.java @@ -4,7 +4,7 @@ import no.fintlabs.gateway.instance.model.File; import no.fintlabs.gateway.instance.model.instance.InstanceObject; import no.fintlabs.gateway.instance.web.FileClient; -import no.fintlabs.instance.gateway.model.oppfolgingstjenesten.IncomingInstance; +import no.fintlabs.instance.gateway.model.vigo.IncomingInstance; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import reactor.core.publisher.Mono; diff --git a/src/main/java/no/fintlabs/instance/gateway/InstanceController.java b/src/main/java/no/fintlabs/instance/gateway/InstanceController.java index be91b78..0319813 100644 --- a/src/main/java/no/fintlabs/instance/gateway/InstanceController.java +++ b/src/main/java/no/fintlabs/instance/gateway/InstanceController.java @@ -2,7 +2,7 @@ import lombok.extern.slf4j.Slf4j; import no.fintlabs.gateway.instance.InstanceProcessor; -import no.fintlabs.instance.gateway.model.oppfolgingstjenesten.IncomingInstance; +import no.fintlabs.instance.gateway.model.vigo.IncomingInstance; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.annotation.AuthenticationPrincipal; diff --git a/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java b/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java index 6d94f22..43cb8f1 100644 --- a/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java +++ b/src/main/java/no/fintlabs/instance/gateway/InstanceProcessorConfiguration.java @@ -2,7 +2,7 @@ import no.fintlabs.gateway.instance.InstanceProcessor; import no.fintlabs.gateway.instance.InstanceProcessorFactoryService; -import no.fintlabs.instance.gateway.model.oppfolgingstjenesten.IncomingInstance; +import no.fintlabs.instance.gateway.model.vigo.IncomingInstance; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Dokument.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Dokument.java similarity index 86% rename from src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Dokument.java rename to src/main/java/no/fintlabs/instance/gateway/model/vigo/Dokument.java index 01f4101..b03a031 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Dokument.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Dokument.java @@ -1,4 +1,4 @@ -package no.fintlabs.instance.gateway.model.oppfolgingstjenesten; +package no.fintlabs.instance.gateway.model.vigo; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/IncomingInstance.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java similarity index 88% rename from src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/IncomingInstance.java rename to src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java index 4d82c9b..9a97eaa 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/IncomingInstance.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/IncomingInstance.java @@ -1,4 +1,4 @@ -package no.fintlabs.instance.gateway.model.oppfolgingstjenesten; +package no.fintlabs.instance.gateway.model.vigo; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Inntaksadresse.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Inntaksadresse.java similarity index 81% rename from src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Inntaksadresse.java rename to src/main/java/no/fintlabs/instance/gateway/model/vigo/Inntaksadresse.java index 9004c06..08b4bbb 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Inntaksadresse.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Inntaksadresse.java @@ -1,4 +1,4 @@ -package no.fintlabs.instance.gateway.model.oppfolgingstjenesten; +package no.fintlabs.instance.gateway.model.vigo; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Kontaktinformasjon.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Kontaktinformasjon.java similarity index 80% rename from src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Kontaktinformasjon.java rename to src/main/java/no/fintlabs/instance/gateway/model/vigo/Kontaktinformasjon.java index dd501d7..547f0e3 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Kontaktinformasjon.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Kontaktinformasjon.java @@ -1,4 +1,4 @@ -package no.fintlabs.instance.gateway.model.oppfolgingstjenesten; +package no.fintlabs.instance.gateway.model.vigo; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Personalia.java b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java similarity index 83% rename from src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Personalia.java rename to src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java index 6879832..ac2838a 100644 --- a/src/main/java/no/fintlabs/instance/gateway/model/oppfolgingstjenesten/Personalia.java +++ b/src/main/java/no/fintlabs/instance/gateway/model/vigo/Personalia.java @@ -1,4 +1,4 @@ -package no.fintlabs.instance.gateway.model.oppfolgingstjenesten; +package no.fintlabs.instance.gateway.model.vigo; import lombok.Builder; import lombok.EqualsAndHashCode; diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 9e818d0..3adba8d 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,5 +1,5 @@ fint: - application-id: fint-flyt-oppfolgingstjenesten-gateway + application-id: fint-flyt-vigo-gateway cache: defaultCacheEntryTimeToLiveMillis: 518400000 defaultCacheHeapSize: 1000000