From 538dc7e29ca94a51cac64b10c55e8c2bb62898c2 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Fri, 14 Jul 2023 09:20:40 +0200 Subject: [PATCH 1/8] Legg inn redis aiven for preprod --- build_n_deploy/naiserator/dev.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/build_n_deploy/naiserator/dev.yaml b/build_n_deploy/naiserator/dev.yaml index 45cb8ffc2..0858150cb 100644 --- a/build_n_deploy/naiserator/dev.yaml +++ b/build_n_deploy/naiserator/dev.yaml @@ -61,4 +61,9 @@ spec: - name: APP_VERSION value: "{{version}}" - name: ENV - value: preprod \ No newline at end of file + value: preprod + redis: + - instance: sessions + access: readwrite + - instance: lookup + access: read \ No newline at end of file From 31f98cddf73f7649bf3aa7bdde3fed7c0686316f Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Tue, 18 Jul 2023 10:10:56 +0200 Subject: [PATCH 2/8] =?UTF-8?q?Oppdater=20til=20canary=20for=20familie-bac?= =?UTF-8?q?kend=20og=20populer=20med=20milj=C3=B8variabler=20for=20=C3=A5?= =?UTF-8?q?=20kj=C3=B8re=20redis=20i=20aiven?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/backend/config.ts | 6 ++++-- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 59eb95ad4..b9a2a0760 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@navikt/ds-react": "2.9.x", "@navikt/ds-react-internal": "2.9.x", "@navikt/ds-tokens": "2.9.x", - "@navikt/familie-backend": "10.0.6", + "@navikt/familie-backend": "10.0.7-alpha.0+00bd582", "@navikt/familie-dokumentliste": "^8.1.0", "@navikt/familie-endringslogg": "^8.1.0", "@navikt/familie-form-elements": "^10.1.2", diff --git a/src/backend/config.ts b/src/backend/config.ts index 881e2955e..b4fd307f3 100644 --- a/src/backend/config.ts +++ b/src/backend/config.ts @@ -115,9 +115,11 @@ const env = Environment(); export const sessionConfig: ISessionKonfigurasjon = { cookieSecret: [`${process.env.COOKIE_KEY1}`, `${process.env.COOKIE_KEY2}`], - navn: 'familie-ef-sak-v1', - redisPassord: process.env.REDIS_PASSWORD, + navn: 'familie-ef-sak-v2', redisUrl: env.redisUrl, + redisFullUrl: process.env.REDIS_URI_SESSIONS, + redisBrukernavn: process.env.REDIS_USERNAME_SESSIONS, + redisPassord: process.env.REDIS_PASSWORD, secureCookie: !( process.env.ENV === 'local' || process.env.ENV === 'e2e' || diff --git a/yarn.lock b/yarn.lock index 553cc4d14..8e7903893 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,10 +3287,10 @@ resolved "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.3/660add888226b08389958f153e3fb6acbb88a8ee#660add888226b08389958f153e3fb6acbb88a8ee" integrity sha512-VvUE32dwhLz01EhgBB2VrvcQboHhQ/z9i95hkO/OM7Vgz6NxsnEZTMHiaeR324Wu1aCEknZxh1hZGaOZgqRqSQ== -"@navikt/familie-backend@10.0.6": - version "10.0.6" - resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.6/80226ffa2af59b80b67b6528cff8207f94447596#80226ffa2af59b80b67b6528cff8207f94447596" - integrity sha512-d3POmLBIosjoykM1w8MXYOiHIrlLOMJFTD7R3qnMpf76JSlG6Ssfuy+iwryQJGraabbEUKwSQWsLmrJx83QIHw== +"@navikt/familie-backend@10.0.7-alpha.0+00bd582": + version "10.0.7-alpha.0" + resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.0/bd4ce2d5da037e0bfccdb471eb25e69fb17cfb0b#bd4ce2d5da037e0bfccdb471eb25e69fb17cfb0b" + integrity sha512-flu7CGi96EdQ8p78rJz971jLlfgR1ehD37O4yie5R/D7mw+Yn/P9dmCbxlOrCLO4NKXuUYfn8maH4Ozr4hROdw== dependencies: "@navikt/familie-logging" "^6.0.0" "@types/cookie-parser" "^1.4.3" From 1e094410e7f3e06c43c1fc9b565b62155943cc85 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Tue, 18 Jul 2023 12:25:46 +0200 Subject: [PATCH 3/8] =?UTF-8?q?M=C3=A5=20bruke=20riktig=20milj=C3=B8variab?= =?UTF-8?q?el=20for=20redis=20passord?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backend/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/config.ts b/src/backend/config.ts index b4fd307f3..53589b1b6 100644 --- a/src/backend/config.ts +++ b/src/backend/config.ts @@ -119,7 +119,7 @@ export const sessionConfig: ISessionKonfigurasjon = { redisUrl: env.redisUrl, redisFullUrl: process.env.REDIS_URI_SESSIONS, redisBrukernavn: process.env.REDIS_USERNAME_SESSIONS, - redisPassord: process.env.REDIS_PASSWORD, + redisPassord: process.env.REDIS_PASSWORD_SESSIONS, secureCookie: !( process.env.ENV === 'local' || process.env.ENV === 'e2e' || From 827bfa0591b0cf0f43552c748d2522c1ccc87b79 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Tue, 18 Jul 2023 15:23:22 +0200 Subject: [PATCH 4/8] Oppdaterer familie-backend med logging av redisconfig --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index b9a2a0760..4541ca8aa 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@navikt/ds-react": "2.9.x", "@navikt/ds-react-internal": "2.9.x", "@navikt/ds-tokens": "2.9.x", - "@navikt/familie-backend": "10.0.7-alpha.0+00bd582", + "@navikt/familie-backend": "10.0.7-alpha.1+db3efed", "@navikt/familie-dokumentliste": "^8.1.0", "@navikt/familie-endringslogg": "^8.1.0", "@navikt/familie-form-elements": "^10.1.2", diff --git a/yarn.lock b/yarn.lock index 8e7903893..c42ddbd6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,10 +3287,10 @@ resolved "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.3/660add888226b08389958f153e3fb6acbb88a8ee#660add888226b08389958f153e3fb6acbb88a8ee" integrity sha512-VvUE32dwhLz01EhgBB2VrvcQboHhQ/z9i95hkO/OM7Vgz6NxsnEZTMHiaeR324Wu1aCEknZxh1hZGaOZgqRqSQ== -"@navikt/familie-backend@10.0.7-alpha.0+00bd582": - version "10.0.7-alpha.0" - resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.0/bd4ce2d5da037e0bfccdb471eb25e69fb17cfb0b#bd4ce2d5da037e0bfccdb471eb25e69fb17cfb0b" - integrity sha512-flu7CGi96EdQ8p78rJz971jLlfgR1ehD37O4yie5R/D7mw+Yn/P9dmCbxlOrCLO4NKXuUYfn8maH4Ozr4hROdw== +"@navikt/familie-backend@10.0.7-alpha.1+db3efed": + version "10.0.7-alpha.1" + resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.1/24aec6569e64d4b4e0ec484946950681232335c2#24aec6569e64d4b4e0ec484946950681232335c2" + integrity sha512-8dgDinFevZHXlH+HtzvJlOd8vWrRpPn82A71SzKMgU8xjPC5Dl2fzFTLePds7c0dH6grAqxIsGJ7lnZsdCsRsQ== dependencies: "@navikt/familie-logging" "^6.0.0" "@types/cookie-parser" "^1.4.3" From adbeecaa0c720d74aa69e6d628343823d4e336a4 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Wed, 19 Jul 2023 08:58:26 +0200 Subject: [PATCH 5/8] Oppdatere familie-backend med pinginterval i redis --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4541ca8aa..00b402b83 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@navikt/ds-react": "2.9.x", "@navikt/ds-react-internal": "2.9.x", "@navikt/ds-tokens": "2.9.x", - "@navikt/familie-backend": "10.0.7-alpha.1+db3efed", + "@navikt/familie-backend": "10.0.7-alpha.2+20a5264", "@navikt/familie-dokumentliste": "^8.1.0", "@navikt/familie-endringslogg": "^8.1.0", "@navikt/familie-form-elements": "^10.1.2", From e7e0fe6cd253a014195868374b6dbc5e532a0d73 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Wed, 19 Jul 2023 08:59:00 +0200 Subject: [PATCH 6/8] Oppdatere familie-backend med pinginterval i redis --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index c42ddbd6e..fad4df7bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,10 +3287,10 @@ resolved "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.3/660add888226b08389958f153e3fb6acbb88a8ee#660add888226b08389958f153e3fb6acbb88a8ee" integrity sha512-VvUE32dwhLz01EhgBB2VrvcQboHhQ/z9i95hkO/OM7Vgz6NxsnEZTMHiaeR324Wu1aCEknZxh1hZGaOZgqRqSQ== -"@navikt/familie-backend@10.0.7-alpha.1+db3efed": - version "10.0.7-alpha.1" - resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.1/24aec6569e64d4b4e0ec484946950681232335c2#24aec6569e64d4b4e0ec484946950681232335c2" - integrity sha512-8dgDinFevZHXlH+HtzvJlOd8vWrRpPn82A71SzKMgU8xjPC5Dl2fzFTLePds7c0dH6grAqxIsGJ7lnZsdCsRsQ== +"@navikt/familie-backend@10.0.7-alpha.2+20a5264": + version "10.0.7-alpha.2" + resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.2/4d34b96f9aa5deb16e32d5d7e1474fa269a7e1c1#4d34b96f9aa5deb16e32d5d7e1474fa269a7e1c1" + integrity sha512-UjpzAWQVSvZtVCnmr7mz8kCC4ezj+Q+DsCg9jQwU8UgGlcNWYmDcCQ9a1FU0Q/TZJML8EN0zmY2WIFnMnDTorw== dependencies: "@navikt/familie-logging" "^6.0.0" "@types/cookie-parser" "^1.4.3" From caeec9785b2ea9ecaaf30f1ea57f236e3db401b9 Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Thu, 20 Jul 2023 08:44:10 +0200 Subject: [PATCH 7/8] Sett opp redis aiven for produksjon, samt bruk siste bibliotek av familie-backend for riktig redis-config --- build_n_deploy/naiserator/prod.yaml | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/build_n_deploy/naiserator/prod.yaml b/build_n_deploy/naiserator/prod.yaml index 8af63d915..46de6899e 100644 --- a/build_n_deploy/naiserator/prod.yaml +++ b/build_n_deploy/naiserator/prod.yaml @@ -61,3 +61,8 @@ spec: value: "{{version}}" - name: ENV value: production + redis: + - instance: sessions + access: readwrite + - instance: lookup + access: read diff --git a/package.json b/package.json index 00b402b83..caf3b25ea 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@navikt/ds-react": "2.9.x", "@navikt/ds-react-internal": "2.9.x", "@navikt/ds-tokens": "2.9.x", - "@navikt/familie-backend": "10.0.7-alpha.2+20a5264", + "@navikt/familie-backend": "10.0.7", "@navikt/familie-dokumentliste": "^8.1.0", "@navikt/familie-endringslogg": "^8.1.0", "@navikt/familie-form-elements": "^10.1.2", From 255177beb6556e28cf09e8c7bdfc82541825d4ea Mon Sep 17 00:00:00 2001 From: charliemidtlyng Date: Thu, 20 Jul 2023 09:43:15 +0200 Subject: [PATCH 8/8] Oppdater yarn lock med siste versjon av familie backend --- yarn.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/yarn.lock b/yarn.lock index fad4df7bf..15e5f2f62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3287,10 +3287,10 @@ resolved "https://npm.pkg.github.com/download/@navikt/ds-tokens/2.9.3/660add888226b08389958f153e3fb6acbb88a8ee#660add888226b08389958f153e3fb6acbb88a8ee" integrity sha512-VvUE32dwhLz01EhgBB2VrvcQboHhQ/z9i95hkO/OM7Vgz6NxsnEZTMHiaeR324Wu1aCEknZxh1hZGaOZgqRqSQ== -"@navikt/familie-backend@10.0.7-alpha.2+20a5264": - version "10.0.7-alpha.2" - resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7-alpha.2/4d34b96f9aa5deb16e32d5d7e1474fa269a7e1c1#4d34b96f9aa5deb16e32d5d7e1474fa269a7e1c1" - integrity sha512-UjpzAWQVSvZtVCnmr7mz8kCC4ezj+Q+DsCg9jQwU8UgGlcNWYmDcCQ9a1FU0Q/TZJML8EN0zmY2WIFnMnDTorw== +"@navikt/familie-backend@10.0.7": + version "10.0.7" + resolved "https://npm.pkg.github.com/download/@navikt/familie-backend/10.0.7/13895e10ffca5656b069985950d8224c9fd1e2db#13895e10ffca5656b069985950d8224c9fd1e2db" + integrity sha512-XDII70qTkKrOq/Ap8qkqpIKEBVKahUcH7bdeG5Y1216FkEgBrtitViqRlyPl5HvCRJJZBumU/q+3smoBRxwdbA== dependencies: "@navikt/familie-logging" "^6.0.0" "@types/cookie-parser" "^1.4.3"