From 77a5b2d8d2a1f0815ed301aa2e70f34901a6dffe Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Thu, 17 Oct 2024 13:01:57 +0200 Subject: [PATCH] - Disables GCP Secret Manager for failing tests. - Normalizes config file name to application-test.yml. --- .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 9 ++++++--- .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 3 +++ .../src/test/resources/application-test.yml | 4 ++++ .../src/test/resources/application-test.yml | 5 +++++ .../src/test/resources/application-test.yml | 6 ++++++ .../src/test/resources/application-test.yml | 5 +++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 5 +++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 2 -- .../src/test/resources/application-test.yml | 8 ++++++++ .../src/test/resources/application-test.yml | 10 ++++++---- .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ ...plication-test.yaml => application-test.yml} | 3 +++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 5 +++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 8 -------- .../src/test/resources/application-test.yml | 15 +++++++++++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 8 +++++++- .../src/test/resources/application-test.yml | 6 ++++++ .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ .../src/test/resources/application-test.yml | 6 ++++++ .../src/test/resources/application-test.yml | 5 +++++ .../src/test/resources/application-test.yml | 3 +++ .../src/test/resources/application-test.yml | 8 +++++++- .../src/test/resources/application-test.yml | 10 +++++++--- .../src/test/resources/application-test.yml | 8 +++++++- .../src/test/resources/application-test.yml | 17 +++++++++++++++++ .../src/test/resources/application.properties | 7 ------- .../src/test/resources/application-test.yml | 3 +++ .../test/resources/application-test.properties | 3 --- .../src/test/resources/application-test.yml | 9 +++++++++ .../src/test/resources/application-test.yml | 9 ++++++--- .../test/resources/application-test.properties | 1 - .../src/test/resources/application-test.yml | 7 +++++++ 64 files changed, 280 insertions(+), 54 deletions(-) delete mode 100644 apps/adresse-service/src/test/resources/application-test.properties create mode 100644 apps/adresse-service/src/test/resources/application-test.yml delete mode 100644 apps/amelding-service/src/test/resources/application-test.properties create mode 100644 apps/amelding-service/src/test/resources/application-test.yml delete mode 100644 apps/arbeidsforhold-service/src/test/resources/application-test.properties create mode 100644 apps/arbeidsforhold-service/src/test/resources/application-test.yml delete mode 100644 apps/batch-bestilling-service/src/test/resources/application-test.properties create mode 100644 apps/batch-bestilling-service/src/test/resources/application-test.yml create mode 100644 apps/endringsmelding-frontend/src/test/resources/application-test.yml delete mode 100644 apps/endringsmelding-service/src/test/resources/application-test.properties create mode 100644 apps/endringsmelding-service/src/test/resources/application-test.yml create mode 100644 apps/faste-data-frontend/src/test/resources/application-test.yml delete mode 100644 apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties create mode 100644 apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.yml delete mode 100644 apps/generer-navn-service/src/test/resources/application-test.properties create mode 100644 apps/generer-navn-service/src/test/resources/application-test.yml delete mode 100644 apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties create mode 100644 apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.yml delete mode 100644 apps/helsepersonell-service/src/test/resources/application-test.properties create mode 100644 apps/helsepersonell-service/src/test/resources/application-test.yml rename apps/inntektsmelding-generator-service/src/test/resources/{application-test.yaml => application-test.yml} (74%) delete mode 100644 apps/inntektsmelding-service/src/test/resources/application-test.properties create mode 100644 apps/inntektsmelding-service/src/test/resources/application-test.yml delete mode 100644 apps/jenkins-batch-status-service/src/test/resources/application-test.properties create mode 100644 apps/jenkins-batch-status-service/src/test/resources/application-test.yml delete mode 100644 apps/joark-dokument-service/src/test/resources/application-test.properties create mode 100644 apps/joark-dokument-service/src/test/resources/application-test.yml create mode 100644 apps/kodeverk-service/src/test/resources/application-test.yml delete mode 100644 apps/miljoer-service/src/test/resources/application-test.properties create mode 100644 apps/miljoer-service/src/test/resources/application-test.yml delete mode 100644 apps/organisasjon-bestilling-service/src/test/resources/application-test.properties create mode 100644 apps/organisasjon-bestilling-service/src/test/resources/application-test.yml delete mode 100644 apps/organisasjon-faste-data-service/src/test/resources/application-test.properties create mode 100644 apps/organisasjon-faste-data-service/src/test/resources/application-test.yml delete mode 100644 apps/organisasjon-mottak-service/src/test/resources/application-test.properties create mode 100644 apps/organisasjon-mottak-service/src/test/resources/application-test.yml delete mode 100644 apps/orgnummer-service/src/test/resources/application-test.properties create mode 100644 apps/orgnummer-service/src/test/resources/application-test.yml delete mode 100644 apps/person-faste-data-service/src/test/resources/application-test.properties create mode 100644 apps/person-faste-data-service/src/test/resources/application-test.yml delete mode 100644 apps/person-service/src/test/resources/application-test.properties create mode 100644 apps/person-service/src/test/resources/application-test.yml create mode 100644 apps/skattekort-service/src/test/resources/application-test.yml create mode 100644 apps/testnav-ident-pool/src/test/resources/application-test.yml delete mode 100644 apps/testnav-ident-pool/src/test/resources/application.properties delete mode 100644 apps/tilbakemelding-api/src/test/resources/application-test.properties create mode 100644 apps/tilbakemelding-api/src/test/resources/application-test.yml delete mode 100644 apps/varslinger-service/src/test/resources/application-test.properties create mode 100644 apps/varslinger-service/src/test/resources/application-test.yml diff --git a/apps/adresse-service/src/test/resources/application-test.properties b/apps/adresse-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/adresse-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/adresse-service/src/test/resources/application-test.yml b/apps/adresse-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..594f36142c8 --- /dev/null +++ b/apps/adresse-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false diff --git a/apps/amelding-service/src/test/resources/application-test.properties b/apps/amelding-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/amelding-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/amelding-service/src/test/resources/application-test.yml b/apps/amelding-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/amelding-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml index 060eeae71e3..77a88244e60 100644 --- a/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml +++ b/apps/app-tilgang-analyse-service/src/test/resources/application-test.yml @@ -1,9 +1,12 @@ DOLLY_READER_TOKEN: test +TOKEN_X_ISSUER: dummy spring: + cloud: + gcp: + secretmanager: + enabled: false flyway: url: jdbc:h2:mem:testdb username: sa - password: - -TOKEN_X_ISSUER: dummy \ No newline at end of file + password: \ No newline at end of file diff --git a/apps/arbeidsforhold-service/src/test/resources/application-test.properties b/apps/arbeidsforhold-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/arbeidsforhold-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/arbeidsforhold-service/src/test/resources/application-test.yml b/apps/arbeidsforhold-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/arbeidsforhold-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/test/resources/application-test.properties b/apps/batch-bestilling-service/src/test/resources/application-test.properties deleted file mode 100644 index 483fe127f1f..00000000000 --- a/apps/batch-bestilling-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/batch-bestilling-service/src/test/resources/application-test.yml b/apps/batch-bestilling-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/batch-bestilling-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/brreg-stub/src/test/resources/application-test.yml b/apps/brreg-stub/src/test/resources/application-test.yml index e76cddc54d0..f7048994c34 100644 --- a/apps/brreg-stub/src/test/resources/application-test.yml +++ b/apps/brreg-stub/src/test/resources/application-test.yml @@ -5,6 +5,9 @@ spring: enabled: false database: enabled: false + gcp: + secretmanager: + enabled: false datasource: url: jdbc:tc:postgresql:15:///test_database username: user diff --git a/apps/bruker-service/src/test/resources/application-test.yml b/apps/bruker-service/src/test/resources/application-test.yml index 4b0268cd2f4..5ac5d4b6204 100644 --- a/apps/bruker-service/src/test/resources/application-test.yml +++ b/apps/bruker-service/src/test/resources/application-test.yml @@ -4,6 +4,10 @@ JWT_SECRET: DUMMY SUPER SECRET JWT KEY THAT IS NOT SECURE TOKEN_X_CLIENT_ID: test spring: + cloud: + gcp: + secretmanager: + enabled: false flyway: url: jdbc:h2:mem:testdb username: sa diff --git a/apps/budpro-service/src/test/resources/application-test.yml b/apps/budpro-service/src/test/resources/application-test.yml index e69de29bb2d..0aeb22a14f6 100644 --- a/apps/budpro-service/src/test/resources/application-test.yml +++ b/apps/budpro-service/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/dolly-frontend/src/test/resources/application-test.yml b/apps/dolly-frontend/src/test/resources/application-test.yml index 74bf801179e..e55e0f2063d 100644 --- a/apps/dolly-frontend/src/test/resources/application-test.yml +++ b/apps/dolly-frontend/src/test/resources/application-test.yml @@ -2,3 +2,9 @@ TOKEN_X_ISSUER: dummy IDPORTEN_CLIENT_ID: dummy IDPORTEN_CLIENT_JWK: "{}" + +spring: + cloud: + gcp: + secretmanager: + enabled: false diff --git a/apps/endringsmelding-frontend/src/test/resources/application-test.yml b/apps/endringsmelding-frontend/src/test/resources/application-test.yml new file mode 100644 index 00000000000..0aeb22a14f6 --- /dev/null +++ b/apps/endringsmelding-frontend/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/endringsmelding-service/src/test/resources/application-test.properties b/apps/endringsmelding-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/endringsmelding-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/endringsmelding-service/src/test/resources/application-test.yml b/apps/endringsmelding-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/endringsmelding-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/faste-data-frontend/src/test/resources/application-test.yml b/apps/faste-data-frontend/src/test/resources/application-test.yml new file mode 100644 index 00000000000..0aeb22a14f6 --- /dev/null +++ b/apps/faste-data-frontend/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.yml b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/generer-arbeidsforhold-populasjon-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/generer-navn-service/src/test/resources/application-test.properties b/apps/generer-navn-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/generer-navn-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/generer-navn-service/src/test/resources/application-test.yml b/apps/generer-navn-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/generer-navn-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties deleted file mode 100644 index f039fb475ec..00000000000 --- a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.properties +++ /dev/null @@ -1,2 +0,0 @@ -TOKEN_X_ISSUER=dummy -KAFKA_KEYSTORE_PATH="" \ No newline at end of file diff --git a/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.yml b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..825469b32e6 --- /dev/null +++ b/apps/generer-organisasjon-populasjon-service/src/test/resources/application-test.yml @@ -0,0 +1,8 @@ +TOKEN_X_ISSUER: dummy +KAFKA_KEYSTORE_PATH: "" + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml index c7ad525dd9c..bb242255464 100644 --- a/apps/generer-synt-amelding-service/src/test/resources/application-test.yml +++ b/apps/generer-synt-amelding-service/src/test/resources/application-test.yml @@ -1,3 +1,6 @@ +AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token +TOKEN_X_ISSUER: dummy + azure: app: client: @@ -6,6 +9,9 @@ azure: spring: cloud: + gcp: + secretmanager: + enabled: false vault: token: dummy @@ -15,7 +21,3 @@ consumers: cluster: dev-gcp namespace: dolly name: synthdata-amelding - - -AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token -TOKEN_X_ISSUER: dummy diff --git a/apps/helsepersonell-service/src/test/resources/application-test.properties b/apps/helsepersonell-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/helsepersonell-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/helsepersonell-service/src/test/resources/application-test.yml b/apps/helsepersonell-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/helsepersonell-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/src/test/resources/application-test.yaml b/apps/inntektsmelding-generator-service/src/test/resources/application-test.yml similarity index 74% rename from apps/inntektsmelding-generator-service/src/test/resources/application-test.yaml rename to apps/inntektsmelding-generator-service/src/test/resources/application-test.yml index 424586f333f..add055a03bb 100644 --- a/apps/inntektsmelding-generator-service/src/test/resources/application-test.yaml +++ b/apps/inntektsmelding-generator-service/src/test/resources/application-test.yml @@ -8,6 +8,9 @@ azure: spring: cloud: + gcp: + secretmanager: + enabled: false vault: token: test enabled: false diff --git a/apps/inntektsmelding-service/src/test/resources/application-test.properties b/apps/inntektsmelding-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/inntektsmelding-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/inntektsmelding-service/src/test/resources/application-test.yml b/apps/inntektsmelding-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/inntektsmelding-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties b/apps/jenkins-batch-status-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/jenkins-batch-status-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/jenkins-batch-status-service/src/test/resources/application-test.yml b/apps/jenkins-batch-status-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/jenkins-batch-status-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/joark-dokument-service/src/test/resources/application-test.properties b/apps/joark-dokument-service/src/test/resources/application-test.properties deleted file mode 100644 index 483fe127f1f..00000000000 --- a/apps/joark-dokument-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/joark-dokument-service/src/test/resources/application-test.yml b/apps/joark-dokument-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/joark-dokument-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/kodeverk-service/src/test/resources/application-test.yml b/apps/kodeverk-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..0aeb22a14f6 --- /dev/null +++ b/apps/kodeverk-service/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/miljoer-service/src/test/resources/application-test.properties b/apps/miljoer-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/miljoer-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/miljoer-service/src/test/resources/application-test.yml b/apps/miljoer-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..594f36142c8 --- /dev/null +++ b/apps/miljoer-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false diff --git a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties b/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/organisasjon-bestilling-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/organisasjon-bestilling-service/src/test/resources/application-test.yml b/apps/organisasjon-bestilling-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..594f36142c8 --- /dev/null +++ b/apps/organisasjon-bestilling-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false diff --git a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties b/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/organisasjon-faste-data-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/src/test/resources/application-test.yml b/apps/organisasjon-faste-data-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/organisasjon-faste-data-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties b/apps/organisasjon-mottak-service/src/test/resources/application-test.properties deleted file mode 100644 index a550c3bea79..00000000000 --- a/apps/organisasjon-mottak-service/src/test/resources/application-test.properties +++ /dev/null @@ -1,8 +0,0 @@ -TOKEN_X_ISSUER=dummy - -kafka.bootstrapservers= dummy -kafka.schemaregistryservers= dummy -kafka.username= dummy -kafka.password= dummy -kafka.truststorepath= dummy -kafka.credstorepassword= dummy \ No newline at end of file diff --git a/apps/organisasjon-mottak-service/src/test/resources/application-test.yml b/apps/organisasjon-mottak-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..a28916c6e65 --- /dev/null +++ b/apps/organisasjon-mottak-service/src/test/resources/application-test.yml @@ -0,0 +1,15 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false + +kafka: + bootstrapservers: dummy + schemaregistryservers: dummy + username: dummy + password: dummy + truststorepath: dummy + credstorepassword: dummy \ No newline at end of file diff --git a/apps/orgnummer-service/src/test/resources/application-test.properties b/apps/orgnummer-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/orgnummer-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/orgnummer-service/src/test/resources/application-test.yml b/apps/orgnummer-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/orgnummer-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/person-faste-data-service/src/test/resources/application-test.properties b/apps/person-faste-data-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/person-faste-data-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/person-faste-data-service/src/test/resources/application-test.yml b/apps/person-faste-data-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/person-faste-data-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml index a52f05f20ca..7e52003da3c 100644 --- a/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml +++ b/apps/person-organisasjon-tilgang-service/src/test/resources/application-test.yml @@ -4,4 +4,10 @@ ALTINN_API_KEY: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy -MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file +MASKINPORTEN_WELL_KNOWN_URL: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/person-search-service/src/test/resources/application-test.yml b/apps/person-search-service/src/test/resources/application-test.yml index 6ddfd499610..ee2f6b75ba0 100644 --- a/apps/person-search-service/src/test/resources/application-test.yml +++ b/apps/person-search-service/src/test/resources/application-test.yml @@ -1,5 +1,11 @@ TOKEN_X_ISSUER: dummy +spring: + cloud: + gcp: + secretmanager: + enabled: false + elasticsearch: client: username: dummy diff --git a/apps/person-service/src/test/resources/application-test.properties b/apps/person-service/src/test/resources/application-test.properties deleted file mode 100644 index e5e55886152..00000000000 --- a/apps/person-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER=dummy \ No newline at end of file diff --git a/apps/person-service/src/test/resources/application-test.yml b/apps/person-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/person-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/profil-api/src/test/resources/application-test.yml b/apps/profil-api/src/test/resources/application-test.yml index 91377f25679..bf7cc5cb0e7 100644 --- a/apps/profil-api/src/test/resources/application-test.yml +++ b/apps/profil-api/src/test/resources/application-test.yml @@ -1,5 +1,11 @@ TOKEN_X_ISSUER: dummy +spring: + cloud: + gcp: + secretmanager: + enabled: false + consumers: testnav-person-organisasjon-tilgang-service: cluster: cluster diff --git a/apps/skattekort-service/src/test/resources/application-test.yml b/apps/skattekort-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..0aeb22a14f6 --- /dev/null +++ b/apps/skattekort-service/src/test/resources/application-test.yml @@ -0,0 +1,5 @@ +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/sykemelding-api/src/test/resources/application-test.yml b/apps/sykemelding-api/src/test/resources/application-test.yml index 96469f485dc..735dd2e274e 100644 --- a/apps/sykemelding-api/src/test/resources/application-test.yml +++ b/apps/sykemelding-api/src/test/resources/application-test.yml @@ -21,6 +21,9 @@ azure: secret: dummy spring: cloud: + gcp: + secretmanager: + enabled: false vault: enabled: false ibm: diff --git a/apps/synt-sykemelding-api/src/test/resources/application-test.yml b/apps/synt-sykemelding-api/src/test/resources/application-test.yml index 1f8e50d2449..0c8f756eae8 100644 --- a/apps/synt-sykemelding-api/src/test/resources/application-test.yml +++ b/apps/synt-sykemelding-api/src/test/resources/application-test.yml @@ -1,8 +1,14 @@ +TOKEN_X_ISSUER: dummy + wiremock: server: port: 0 -TOKEN_X_ISSUER: dummy +spring: + cloud: + gcp: + secretmanager: + enabled: false consumers: synt-sykemelding: diff --git a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml index c3803f91db5..b9cb22f75c1 100644 --- a/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml +++ b/apps/synt-vedtakshistorikk-service/src/test/resources/application-test.yml @@ -1,5 +1,12 @@ +AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token TOKEN_X_ISSUER: dummy +spring: + cloud: + gcp: + secretmanager: + enabled: false + consumers: synt-vedtakshistorikk: url: http://localhost:${wiremock.server.port:0}/synt @@ -27,9 +34,6 @@ consumers: name: testnav-pdl-proxy url: http://localhost:${wiremock.server.port:0}/pdl - -AAD_ISSUER_URI: http://localhost:${wiremock.server.port:0}/token - batch: miljoe: test antallMedHistorikk: 0 diff --git a/apps/tenor-search-service/src/test/resources/application-test.yml b/apps/tenor-search-service/src/test/resources/application-test.yml index dee4ed64372..c9e2e70764b 100644 --- a/apps/tenor-search-service/src/test/resources/application-test.yml +++ b/apps/tenor-search-service/src/test/resources/application-test.yml @@ -2,4 +2,10 @@ TOKEN_X_ISSUER: dummy MASKINPORTEN_CLIENT_ID: dummy MASKINPORTEN_CLIENT_JWK: dummy MASKINPORTEN_SCOPES: dummy -MASKINPORTEN_WELL_KNOWN_URL: dummy \ No newline at end of file +MASKINPORTEN_WELL_KNOWN_URL: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/testnav-ident-pool/src/test/resources/application-test.yml b/apps/testnav-ident-pool/src/test/resources/application-test.yml new file mode 100644 index 00000000000..bea909f59d4 --- /dev/null +++ b/apps/testnav-ident-pool/src/test/resources/application-test.yml @@ -0,0 +1,17 @@ +TOKEN_X_ISSUER: dummy + +### DATABASE ### +spring: + datasource: + driver-class-name: org.h2.Driver + url: jdbc:h2:mem:testdb;MODE=Postgresql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE; + cloud: + gcp: + secretmanager: + enabled: false + +tps-forvalteren: + rest: + api: + url: dummy + diff --git a/apps/testnav-ident-pool/src/test/resources/application.properties b/apps/testnav-ident-pool/src/test/resources/application.properties deleted file mode 100644 index 1691598aacc..00000000000 --- a/apps/testnav-ident-pool/src/test/resources/application.properties +++ /dev/null @@ -1,7 +0,0 @@ -### DATABASE ### -spring.datasource.driver-class-name=org.h2.Driver -spring.datasource.url=jdbc:h2:mem:testdb;MODE=Postgresql;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE; - -tps-forvalteren.rest.api.url=dummy - -TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml index ab90dcc896b..00f18d3c630 100644 --- a/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml +++ b/apps/testnorge-statisk-data-forvalter/src/test/resources/application-test.yml @@ -12,6 +12,9 @@ spring: flyway: enabled: true cloud: + gcp: + secretmanager: + enabled: false vault: token: dummy diff --git a/apps/tilbakemelding-api/src/test/resources/application-test.properties b/apps/tilbakemelding-api/src/test/resources/application-test.properties deleted file mode 100644 index b03ff5a1383..00000000000 --- a/apps/tilbakemelding-api/src/test/resources/application-test.properties +++ /dev/null @@ -1,3 +0,0 @@ -SLACK_TOKEN=dummy -SLACK_CHANNEL=dummy -TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/tilbakemelding-api/src/test/resources/application-test.yml b/apps/tilbakemelding-api/src/test/resources/application-test.yml new file mode 100644 index 00000000000..70b69dfb28a --- /dev/null +++ b/apps/tilbakemelding-api/src/test/resources/application-test.yml @@ -0,0 +1,9 @@ +SLACK_TOKEN: dummy +SLACK_CHANNEL: dummy +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file diff --git a/apps/udi-stub/src/test/resources/application-test.yml b/apps/udi-stub/src/test/resources/application-test.yml index 123ac8aa009..e191f5ee131 100644 --- a/apps/udi-stub/src/test/resources/application-test.yml +++ b/apps/udi-stub/src/test/resources/application-test.yml @@ -1,5 +1,10 @@ +TOKEN_X_ISSUER: dummy + spring: cloud: + gcp: + secretmanager: + enabled: false vault: database: enabled: false @@ -13,6 +18,4 @@ spring: hibernate: ddl-auto: create flyway: - enabled: false - -TOKEN_X_ISSUER: dummy \ No newline at end of file + enabled: false \ No newline at end of file diff --git a/apps/varslinger-service/src/test/resources/application-test.properties b/apps/varslinger-service/src/test/resources/application-test.properties deleted file mode 100644 index 483fe127f1f..00000000000 --- a/apps/varslinger-service/src/test/resources/application-test.properties +++ /dev/null @@ -1 +0,0 @@ -TOKEN_X_ISSUER= dummy \ No newline at end of file diff --git a/apps/varslinger-service/src/test/resources/application-test.yml b/apps/varslinger-service/src/test/resources/application-test.yml new file mode 100644 index 00000000000..aa8bfa92394 --- /dev/null +++ b/apps/varslinger-service/src/test/resources/application-test.yml @@ -0,0 +1,7 @@ +TOKEN_X_ISSUER: dummy + +spring: + cloud: + gcp: + secretmanager: + enabled: false \ No newline at end of file