cleanup/deprecated_sm#4229
Merged
Merged
Conversation
* Fixed some warnings related to raw use of parametrized type.
Contributor
Author
Contributor
There was a problem hiding this comment.
Pull request overview
This PR migrates local Spring configuration to use the new Secret Manager import scheme (sm@) instead of the deprecated sm://, across a wide set of services/proxies. It also updates one local NAIS initializer to emit sm@... placeholders, and includes a couple of DTO/Jackson-related adjustments.
Changes:
- Update
spring.config.importfrom"sm://"to"sm@"in manyapplication-local*.ymlfiles. - Update local NAIS environment initializer to use
sm@...placeholders. - Adjust DTO/Jackson code (enum deserializer generics/API call; Lombok builder defaults).
Reviewed changes
Copilot reviewed 60 out of 60 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| proxies/yrkesskade-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/texas-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/synthdata-meldekort-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/sykemelding-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/pdl-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/nom-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/dolly-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/brregstub-reverse-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/arbeidssoekerregisteret-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/arbeidsplassencv-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| proxies/altinn3-tilgang-proxy/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| libs/testing/src/main/java/no/nav/dolly/libs/nais/NaisEnvironmentApplicationContextInitializer.java | Update local NAIS env emulation to use sm@... placeholders (and NonNull import change). |
| libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/jackson/v1/CaseInsensitiveEnumDeserializer.java | Tighten generics and change how enum text is read from the parser. |
| libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/ereg/v1/NAVSpesifikkInformasjon.java | Ensure builder defaults preserve non-null nested period objects. |
| apps/varslinger-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/udi-stub/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/tps-messaging-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/tps-messaging-frontend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/testnorge-statisk-data-forvalter/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/testnav-ident-pool/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/tenor-search-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/synt-vedtakshistorikk-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/sykemelding-api/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/profil-api/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/person-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/person-faste-data-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/pdl-lagre-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/pdl-forvalter/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/oversikt-frontend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/orgnummer-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/organisasjon-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/organisasjon-mottak-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/organisasjon-forvalter/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/organisasjon-faste-data-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/organisasjon-bestilling-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/miljoer-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/levende-arbeidsforhold-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/levende-arbeidsforhold-scheduler/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/levende-arbeidsforhold-ansettelse/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/kodeverk-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/joark-dokument-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/jenkins-batch-status-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/inntektsmelding-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/inntektsmelding-generator-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/helsepersonell-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/generer-navn-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/faste-data-frontend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/endringsmelding-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/endringsmelding-frontend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/dolly-search-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/dolly-frontend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/dolly-backend/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/budpro-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/bruker-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/batch-bestilling-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/app-tilgang-analyse-service/src/main/resources/application-localdb.yml | Switch local Secret Manager import to sm@. |
| apps/app-tilgang-analyse-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/api-oversikt-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/altinn3-tilgang-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
| apps/adresse-service/src/main/resources/application-local.yml | Switch local Secret Manager import to sm@. |
Comments suppressed due to low confidence (4)
apps/dolly-backend/src/main/resources/application-local.yml:14
- This file still contains Secret Manager placeholders using the deprecated
sm\://scheme (e.g. for datasource passwords), even thoughspring.config.importwas migrated tosm@. Ifsm://is being phased out, these placeholders should be migrated tosm@...as well to avoid future startup failures.
import: "sm@"
flyway:
url: jdbc:postgresql://localhost:5432/testnav-dolly-backend-local
user: testnav-dolly-backend-local
password: ${sm\://testnav-dolly-backend-local}
apps/organisasjon-forvalter/src/main/resources/application-local.yml:7
- This file still contains Secret Manager placeholders using the deprecated
sm\://scheme (e.g.spring.datasource.password) whilespring.config.importwas updated tosm@. Consider migrating the remaining placeholders tosm@...as well so the file is fully compatible whensm://support is removed.
import: "sm@"
datasource:
url: jdbc:postgresql://localhost:5432/testnav-organisasjon-forvalter-local
username: testnav-organisasjon-forvalter-local
password: ${sm\://testnav-organisasjon-forvalter-local}
apps/pdl-forvalter/src/main/resources/application-local.yml:7
- This file still contains Secret Manager placeholders using the deprecated
sm\://scheme for DB credentials whilespring.config.importwas migrated tosm@. Consider migrating the remaining placeholders tosm@...as well (there are additionalsm\://occurrences later in the file).
proxies/pdl-proxy/src/main/resources/application-local.yml:7 - This file still contains Secret Manager placeholders using the deprecated
sm\://scheme (e.g.app.elastic.username/password) whilespring.config.importwas migrated tosm@. Consider migrating the remaining placeholders tosm@...as well to avoid future breakage whensm://support is removed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
tl;dr - sm:// er deprecated, sm@ er framtiden.
Fjerner også et par små warnings i data-transfer-objects som støyer.
This pull request updates the
spring.config.importproperty in theapplication-local.yml(and oneapplication-localdb.yml) files across multiple services. The value is changed from"sm://"to"sm@". This change is likely related to a required update in how Spring handles configuration imports, possibly due to a library or platform upgrade.The most important changes are:
Configuration Import Update Across Services:
spring.config.importfrom"sm://"to"sm@"in the following service configuration files to ensure compatibility with the latest Spring configuration standards:apps/adresse-service/src/main/resources/application-local.ymlapps/altinn3-tilgang-service/src/main/resources/application-local.ymlapps/api-oversikt-service/src/main/resources/application-local.ymlapps/app-tilgang-analyse-service/src/main/resources/application-local.ymlapps/app-tilgang-analyse-service/src/main/resources/application-localdb.ymlapps/batch-bestilling-service/src/main/resources/application-local.ymlapps/bruker-service/src/main/resources/application-local.ymlapps/budpro-service/src/main/resources/application-local.ymlapps/dolly-backend/src/main/resources/application-local.ymlapps/dolly-frontend/src/main/resources/application-local.ymlapps/dolly-search-service/src/main/resources/application-local.ymlapps/endringsmelding-frontend/src/main/resources/application-local.ymlapps/endringsmelding-service/src/main/resources/application-local.ymlapps/faste-data-frontend/src/main/resources/application-local.ymlapps/generer-navn-service/src/main/resources/application-local.ymlapps/helsepersonell-service/src/main/resources/application-local.ymlapps/inntektsmelding-generator-service/src/main/resources/application-local.ymlapps/inntektsmelding-service/src/main/resources/application-local.ymlapps/jenkins-batch-status-service/src/main/resources/application-local.ymlapps/joark-dokument-service/src/main/resources/application-local.ymlThis update is a straightforward but important change to maintain configuration compatibility and prevent potential issues with application startup or secret management.