oppdater bigquery views

Author: sondrele

iac/bigquery-terraform/dev/datastreams.tf

@@ -11,7 +11,7 @@ module "mr_api_datastream" {
   source                     = "git::https://github.com/navikt/terraform-google-bigquery-datastream.git?ref=v1.0.1"
   gcp_project                = var.gcp_project
   application_name           = "mulighetsrommet-api"
-  cloud_sql_instance_name    = "mulighetsrommet-api"
+  cloud_sql_instance_name    = "mulighetsrommet-api-v1"
   cloud_sql_instance_db_name = "mulighetsrommet-api-db"
   cloud_sql_instance_db_credentials = jsondecode(
     data.google_secret_manager_secret_version.mr_api_datastream_secret.secret_data

iac/bigquery-terraform/dev/views-mr-api.tf

@@ -42,11 +42,11 @@ WHERE tiltakskode IS NOT NULL
 EOF
 }
 
-module "mr_api_tiltaksgjennomforing_view" {
+module "mr_api_gjennomforing_view" {
   source              = "../modules/google-bigquery-view"
   deletion_protection = false
   dataset_id          = module.mr_api_datastream.dataset_id
-  view_id             = "tiltaksgjennomforing_view"
+  view_id             = "gjennomforing_view"
   view_schema = jsonencode(
     [
       {
@@ -95,7 +95,7 @@ SELECT
   avsluttet_tidspunkt,
   start_dato,
   slutt_dato
-FROM `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_tiltaksgjennomforing`
+FROM `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_gjennomforing`
 WHERE slutt_dato is null or slutt_dato >= DATE '2018-01-01'
 EOF
 }

iac/bigquery-terraform/prod/datastreams.tf

@@ -11,7 +11,7 @@ module "mr_api_datastream" {
   source                     = "git::https://github.com/navikt/terraform-google-bigquery-datastream.git?ref=v1.0.1"
   gcp_project                = var.gcp_project
   application_name           = "mulighetsrommet-api"
-  cloud_sql_instance_name    = "mulighetsrommet-api"
+  cloud_sql_instance_name    = "mulighetsrommet-api-v1"
   cloud_sql_instance_db_name = "mulighetsrommet-api-db"
   cloud_sql_instance_db_credentials = jsondecode(
     data.google_secret_manager_secret_version.mr_api_datastream_secret.secret_data

iac/bigquery-terraform/prod/views-mr-api.tf

@@ -42,11 +42,11 @@ WHERE tiltakskode IS NOT NULL
 EOF
 }
 
-module "mr_api_tiltaksgjennomforing_view" {
+module "mr_api_gjennomforing_view" {
   source              = "../modules/google-bigquery-view"
   deletion_protection = false
   dataset_id          = module.mr_api_datastream.dataset_id
-  view_id             = "tiltaksgjennomforing_view"
+  view_id             = "gjennomforing_view"
   view_schema = jsonencode(
     [
       {
@@ -95,16 +95,16 @@ SELECT
   avsluttet_tidspunkt,
   start_dato,
   slutt_dato
-FROM `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_tiltaksgjennomforing`
+FROM `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_gjennomforing`
 WHERE slutt_dato is null or slutt_dato >= DATE '2018-01-01'
 EOF
 }
 
-module "mr_api_tiltaksgjennomforing_opphav_antall_opprettet_view" {
+module "mr_api_gjennomforing_opphav_antall_opprettet_view" {
   source              = "../modules/google-bigquery-view"
   deletion_protection = false
   dataset_id          = module.mr_api_datastream.dataset_id
-  view_id             = "tiltaksgjennomforing_opphav_antall_opprettet_view"
+  view_id             = "gjennomforing_opphav_antall_opprettet_view"
   view_schema = jsonencode(
     [
       {
@@ -132,7 +132,7 @@ select
     tiltakstype.navn,
     gjennomforing.opphav,
     count(*) as antall_opprettet
-from `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_tiltaksgjennomforing` gjennomforing
+from `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_gjennomforing` gjennomforing
          join `${var.gcp_project["project"]}.${module.mr_api_datastream.dataset_id}.public_tiltakstype` tiltakstype on gjennomforing.tiltakstype_id = tiltakstype.id
 group by tiltakstype.navn, gjennomforing.opphav
 order by tiltakstype.navn