From dcc3f3905d57c547d7483f1703dedfa999268d29 Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Thu, 26 Sep 2024 13:15:01 +0200 Subject: [PATCH 1/8] Update README.md --- README.md | 52 ++++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 327cf56..e890ed3 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,28 @@ ### Før utvikling -All utvikling skjer i `dev`, og ikke i egne brancher. Før man starter med utvikling må man sørge for at `dev` branchen er in sync med `main` ved å gjøre følgende: +All utvikling skjer i egne brancher hvor man merger endringene fra utviklingsbranchen til miljøet man ønsker koden (`dev` eller `main`). En typisk arbeidsflyt vill derfor se slik ut: + +```mermaid +gitGraph + commit + commit + commit + branch min-superfancy-utviklingsbranch + checkout min-superfancy-utviklingsbranch + commit + checkout main + branch dev + checkout dev + merge min-superfancy-utviklingsbranch + checkout min-superfancy-utviklingsbranch + commit + commit + checkout dev + merge min-superfancy-utviklingsbranch + checkout main + merge min-superfancy-utviklingsbranch +``` Stå i `main` branchen. @@ -28,24 +49,18 @@ Pull endringer i `main` git pull ``` -Bytt til `dev` branch - -``` -git checkout dev -``` -Pull endringer fra `main` til `dev` +Opprett egen utviklingsbranch ``` -git pull origin main +git switch -c min-superfancy-utviklingsbranch ``` -Nå er koden in-sync med `main` og utviklingen kan starte. -### Deploye til prod +### Deploy -Når du ønsker å deploye kode til prod, må koden pushes til main-branchen. +Når du ønsker å deploye kode til prod, eller dev må koden pushes til main-branchen for prod eller dev. ``` -git checkout main +git switch
``` ``` @@ -53,21 +68,10 @@ git pull ``` ``` -git merge dev +git merge `` ``` ``` git push ``` -``` -git checkout dev -``` - -``` -git pull origin main -``` - -``` -git push -``` \ No newline at end of file From bb453f53e3b8f07a40fdd6b8476fc772106878cd Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Thu, 26 Sep 2024 13:15:41 +0200 Subject: [PATCH 2/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e890ed3..3c284a7 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ ### Før utvikling -All utvikling skjer i egne brancher hvor man merger endringene fra utviklingsbranchen til miljøet man ønsker koden (`dev` eller `main`). En typisk arbeidsflyt vill derfor se slik ut: +All utvikling skjer i egne brancher hvor man merger endringene fra utviklingsbranchen til miljøet man ønsker å kjøre koden (`dev` eller `main`). En typisk arbeidsflyt vill derfor se slik ut: ```mermaid gitGraph From f47bc1cdbf27c7df653a8d5e4a021db980c14851 Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Thu, 26 Sep 2024 22:15:19 +0200 Subject: [PATCH 3/8] Fikse tabell ukjent tabell i anaplan_datahub_regnskapsdata Tabellen har byttet navn. Ref. 1: https://github.com/navikt/vdl-regnskapsdata/pull/215 2: https://nav-it.slack.com/archives/C04160HE2JX/p1727372656414349 --- dags/anaplan_datahub_regnskapsdata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dags/anaplan_datahub_regnskapsdata.py b/dags/anaplan_datahub_regnskapsdata.py index d8707f1..b237ee1 100644 --- a/dags/anaplan_datahub_regnskapsdata.py +++ b/dags/anaplan_datahub_regnskapsdata.py @@ -96,7 +96,7 @@ def transfer( k.oppgaver_segment_kode, k.felles_segment_kode, sum(netto_nok) as sum_netto_nok - from regnskap.marts.fak_kontant_hovedbok_posteringer_v0 k + from regnskap.marts.fak_kontanthovedbok_posteringer_v0 k join regnskap.marts.dim_statsregnskapskonti ds on 1=1 and ds.pk_dim_statsregnskapskonti = k.fk_dim_statsregnskapskonti where 1=1 From 7ad15868158c180275c5f4cc6e3aeab34d45f5ac Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Thu, 26 Sep 2024 22:21:48 +0200 Subject: [PATCH 4/8] Refaktorere sql i anaplan_datahub_regnskapsdata Formatert med sqlfmt --- dags/anaplan_datahub_regnskapsdata.py | 60 ++++++++++++++------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/dags/anaplan_datahub_regnskapsdata.py b/dags/anaplan_datahub_regnskapsdata.py index b237ee1..34c8594 100644 --- a/dags/anaplan_datahub_regnskapsdata.py +++ b/dags/anaplan_datahub_regnskapsdata.py @@ -77,35 +77,37 @@ def transfer( "name": "agg_hovedbok_posteringer_all_mnd_snowflake.csv", }, query=""" - select - md5( - k.periode_navn|| - ds.statsregnskapskonti_segment_kode_niva_2||'000000'|| - k.artskonti_segment_kode|| - k.kostnadssteder_segment_kode|| - k.produkter_segment_kode|| - k.oppgaver_segment_kode|| - k.felles_segment_kode - ) as pk, - k.periode_navn, - -- Lagt til 6 nuller, pga. bakoverkompatibilitet - ds.statsregnskapskonti_segment_kode_niva_2||'000000' as statsregnskapskonti_segment_kode, - k.artskonti_segment_kode, - k.kostnadssteder_segment_kode, - k.produkter_segment_kode, - k.oppgaver_segment_kode, - k.felles_segment_kode, - sum(netto_nok) as sum_netto_nok - from regnskap.marts.fak_kontanthovedbok_posteringer_v0 k - join regnskap.marts.dim_statsregnskapskonti ds on 1=1 - and ds.pk_dim_statsregnskapskonti = k.fk_dim_statsregnskapskonti - where 1=1 - and k.er_budsjett_postering = 0 - and ( - endswith(k.periode_navn, '23') or - endswith(k.periode_navn, '24') - ) - group by all + select + md5( + k.periode_navn + || ds.statsregnskapskonti_segment_kode_niva_2 + || '000000' + || k.artskonti_segment_kode + || k.kostnadssteder_segment_kode + || k.produkter_segment_kode + || k.oppgaver_segment_kode + || k.felles_segment_kode + ) as pk, + k.periode_navn, + -- Lagt til 6 nuller, pga. bakoverkompatibilitet + ds.statsregnskapskonti_segment_kode_niva_2 + || '000000' as statsregnskapskonti_segment_kode, + k.artskonti_segment_kode, + k.kostnadssteder_segment_kode, + k.produkter_segment_kode, + k.oppgaver_segment_kode, + k.felles_segment_kode, + sum(netto_nok) as sum_netto_nok + from regnskap.marts.fak_kontanthovedbok_posteringer_v0 k + join + regnskap.marts.dim_statsregnskapskonti ds + on 1 = 1 + and ds.pk_dim_statsregnskapskonti = k.fk_dim_statsregnskapskonti + where + 1 = 1 + and k.er_budsjett_postering = 0 + and (endswith(k.periode_navn, '23') or endswith(k.periode_navn, '24')) + group by all """, import_hierarchy_data={ "id": "112000000053", From 3219bad5feb2ca5f72830ff955990a276fade897 Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Fri, 27 Sep 2024 09:08:46 +0200 Subject: [PATCH 5/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3c284a7..47a5eec 100644 --- a/README.md +++ b/README.md @@ -40,7 +40,7 @@ gitGraph Stå i `main` branchen. ``` -git checkout main +git switch main ``` Pull endringer i `main` @@ -57,7 +57,7 @@ git switch -c min-superfancy-utviklingsbranch ### Deploy -Når du ønsker å deploye kode til prod, eller dev må koden pushes til main-branchen for prod eller dev. +Når du ønsker å deploye kode til prod, eller dev må koden pushes til main-branchen for prod eller dev-branchen for dev. ``` git switch
From a55e59e9959b8971708af7b13c03efa85854e86a Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Fri, 27 Sep 2024 13:57:26 +0200 Subject: [PATCH 6/8] Flytte bygging av inbound-image til navikt/inbound --- .github/workflows/inbound-image.yaml | 26 -------------------------- docker/inbound/.dockerignore | 2 -- docker/inbound/Dockerfile | 12 ------------ docker/inbound/requirements.txt | 1 - 4 files changed, 41 deletions(-) delete mode 100644 .github/workflows/inbound-image.yaml delete mode 100644 docker/inbound/.dockerignore delete mode 100644 docker/inbound/Dockerfile delete mode 100644 docker/inbound/requirements.txt diff --git a/.github/workflows/inbound-image.yaml b/.github/workflows/inbound-image.yaml deleted file mode 100644 index cbd9ece..0000000 --- a/.github/workflows/inbound-image.yaml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build Inbound Image - -on: - push: - paths: - - .github/workflows/inbound-image.yaml - - docker/inbound/** - workflow_dispatch: - -jobs: - build_and_push: - name: Build and push docker container - runs-on: ubuntu-latest - permissions: - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v4 - - uses: nais/docker-build-push@v0 - with: - team: virksomhetsdatalaget - image_suffix: inbound - dockerfile: docker/inbound/Dockerfile - docker_context: docker/inbound - project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} - identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} diff --git a/docker/inbound/.dockerignore b/docker/inbound/.dockerignore deleted file mode 100644 index 3099ac2..0000000 --- a/docker/inbound/.dockerignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!requirements.txt \ No newline at end of file diff --git a/docker/inbound/Dockerfile b/docker/inbound/Dockerfile deleted file mode 100644 index 0561607..0000000 --- a/docker/inbound/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -FROM python:3.11-slim-bookworm@sha256:fc39d2e68b554c3f0a5cb8a776280c0b3d73b4c04b83dbade835e2a171ca27ef AS base -RUN apt-get update - -RUN apt-get install -y git - -# innstall python packages -WORKDIR / -RUN python3 -m venv /venv --without-pip -COPY requirements.txt . -RUN pip --python /venv/bin/python install -r requirements.txt -# Set Python path -ENV PATH="/venv/bin:${PATH}" \ No newline at end of file diff --git a/docker/inbound/requirements.txt b/docker/inbound/requirements.txt deleted file mode 100644 index 25ab877..0000000 --- a/docker/inbound/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -inbound[snowflake,oracle] @ git+https://github.com/navikt/inbound@v0.2.1 From fdb2510cf9e66f3787d33cc785855075d6d036d7 Mon Sep 17 00:00:00 2001 From: Patrick Pedersen Date: Fri, 27 Sep 2024 14:00:34 +0200 Subject: [PATCH 7/8] Oppgradere inbound-image i run_eiendom --- dags/run_eiendom.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dags/run_eiendom.py b/dags/run_eiendom.py index 2a730fd..4dc5bcc 100644 --- a/dags/run_eiendom.py +++ b/dags/run_eiendom.py @@ -9,7 +9,7 @@ from custom.operators.slack_operator import slack_success, test_slack -INBOUND_IMAGE = "europe-north1-docker.pkg.dev/nais-management-233d/virksomhetsdatalaget/vdl-airflow-inbound@sha256:7721e3e6f6a1f9d0ceff92116e153408c5ebf2097d682a8e4863220af430f272" +INBOUND_IMAGE = "europe-north1-docker.pkg.dev/nais-management-233d/virksomhetsdatalaget/inbound@sha256:8a6c9e3dc18ea89e9ef51bd703a4e3e67033127e97b77d50bc63dac6cd208dc6" DBT_IMAGE = "ghcr.io/dbt-labs/dbt-snowflake:1.8.3@sha256:b95cc0481ec39cb48f09d63ae0f912033b10b32f3a93893a385262f4ba043f50" SNOW_ALLOWLIST = [ "wx23413.europe-west4.gcp.snowflakecomputing.com", From 7f3c77e49383a51983e98cb79d6efcc23e072327 Mon Sep 17 00:00:00 2001 From: trineno <161321609+trineno@users.noreply.github.com> Date: Mon, 30 Sep 2024 09:07:24 +0200 Subject: [PATCH 8/8] Legge til last av oversettelser for mainmanager --- dags/run_eiendom.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dags/run_eiendom.py b/dags/run_eiendom.py index 4dc5bcc..3235b2a 100644 --- a/dags/run_eiendom.py +++ b/dags/run_eiendom.py @@ -187,6 +187,7 @@ def run_dbt_job(job_name: str): mainmanager__dim_adresse = last_fra_mainmanager("mainmanager__dim_adresse") mainmanager__dim_bygg = last_fra_mainmanager("mainmanager__dim_bygg") mainmanager__dim_lokasjon = last_fra_mainmanager("mainmanager__dim_lokasjon") + mainmanager__oversettelser = last_fra_mainmanager("mainmanager__oversettelser") dvh_kodeverk__org_enhet_til_node = last_fra_dvh_eiendom( "dvh_kodeverk__org_enhet_til_node" @@ -246,6 +247,7 @@ def run_dbt_job(job_name: str): mainmanager__dim_adresse >> dbt_run mainmanager__dim_bygg >> dbt_run mainmanager__dim_lokasjon >> dbt_run + mainmanager__oversettelser >> dbt_run dvh_kodeverk__org_enhet_til_node >> dbt_run dvh_kodeverk__dim_org >> dbt_run