chore: renaming nwp service to include metoffice (#476)

terraform/nowcasting/development/main.tf

@@ -156,7 +156,7 @@ resource "aws_secretsmanager_secret" "pv_consumer_secret" {
 module "nwp-national" {
   source = "../../modules/services/ecs_task"
 
-  ecs-task_name = "nwp-national"
+  ecs-task_name = "nwp-metoffice"
   ecs-task_type = "consumer"
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   ecs-task_size = {
@@ -193,7 +193,7 @@ module "nwp-national" {
     "--source=metoffice",
     "--sink=s3",
     "--rdir=raw-national",
-    "--zdir=data-national",
+    "--zdir=data-metoffice",
     "--create-latest"
   ]
 }
@@ -522,7 +522,7 @@ module "national_forecast" {
   s3_nwp_bucket = {
     bucket_id              = module.s3.s3-nwp-bucket.id
     bucket_read_policy_arn = module.s3.iam-policy-s3-nwp-read.arn
-    datadir                = "data-national"
+    datadir                = "data-metoffice"
   }
 
   sentry_dsn = var.sentry_dsn
@@ -552,7 +552,7 @@ module "forecast_pvnet" {
   s3_nwp_bucket = {
     bucket_id              = module.s3.s3-nwp-bucket.id
     bucket_read_policy_arn = module.s3.iam-policy-s3-nwp-read.arn
-    datadir                = "data-national"
+    datadir                = "data-metoffice"
   }
   s3_satellite_bucket = {
     bucket_id              = module.s3.s3-sat-bucket.id
@@ -812,7 +812,7 @@ module "pvsite_forecast" {
   s3_nwp_bucket = {
     bucket_id              = module.s3.s3-nwp-bucket.id
     bucket_read_policy_arn = module.s3.iam-policy-s3-nwp-read.arn
-    datadir                = "data-national"
+    datadir                = "data-metoffice"
   }
   ecs-task_execution_role_arn = module.ecs.ecs_task_execution_role_arn
   sentry_dsn = var.sentry_dsn

terraform/nowcasting/development/variables.tf

@@ -1,23 +1,19 @@
 variable "region" {
   description = "The AWS region to use"
-  default = "eu-west-1"
+  default     = "eu-west-1"
 }
 
 //Networking
 variable "vpc_cidr" {
   description = "The CIDR block of the vpc"
-  type = string
-  default = "10.0.0.0/16"
+  type        = string
+  default     = "10.0.0.0/16"
 }
 
 variable "api_version" {
   description = "The API version"
 }
 
-variable "data_visualization_version" {
-  description = "The Data Visualization version"
-}
-
 variable "forecast_version" {
   description = "The Forecast version"
 }
@@ -40,12 +36,12 @@ variable "pv_ss_version" {
 
 variable "gsp_version" {
   description = "The GSP Consumer version"
-  default = "0.0.2"
+  default     = "0.0.2"
 }
 
 variable "internal_ui_version" {
-   description = "The Internal UI version"
-   default = "main"
+  description = "The Internal UI version"
+  default     = "main"
 }
 
 variable "cloudflare_zone_id" {
@@ -54,30 +50,30 @@ variable "cloudflare_zone_id" {
 
 variable "metrics_version" {
   description = "The Metrics version"
-  default = "0.0.2"
+  default     = "0.0.2"
 }
 
 variable "auth_domain" {
   description = "The Auth domain that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "auth_dashboard_client_id" {
   description = "The Auth client id for the dashboard that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "auth_api_audience" {
   description = "The Auth API Audience that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "national_forecast_version" {
   description = "The National Forecast version"
 }
 
 variable "sentry_dsn" {
-  type = string
+  type        = string
   description = "DNS for Sentry monitoring"
 }
 
@@ -91,34 +87,34 @@ variable "forecast_blend_version" {
 }
 
 variable "pvsite_api_version" {
-  type = string
+  type        = string
   description = "This gives the version of the PV Site API"
 }
 
 variable "pvsite_forecast_version" {
-  type = string
+  type        = string
   description = "The version of the PVSite forecaster to use"
 }
 
 variable "database_cleanup_version" {
-  type = string
+  type        = string
   description = "The version of the database clean up to use"
 }
 
 variable "airflow_conn_slack_api_default" {
-  type = string
+  type        = string
   description = "The slack connection string for airflow"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "forecast_pvnet_day_ahead_docker_version" {
-  type = string
+  type        = string
   description = "The Forecast PVnet 2.0 day ahead docker version"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "sentry_dsn_api" {
-  type = string
+  type        = string
   description = "The Sentry DSN for all backend components"
-  default = ""
-}
+  default     = ""
+}

terraform/nowcasting/production/variables.tf

@@ -10,10 +10,6 @@ variable "api_version" {
   description = "The API version"
 }
 
-variable "data_visualization_version" {
-  description = "The Data Visualization version"
-}
-
 variable "forecast_version" {
   description = "The Forecast version"
 }
@@ -36,7 +32,7 @@ variable "pv_ss_version" {
 
 variable "gsp_version" {
   description = "The GSP Consumer version"
-  default = "0.0.2"
+  default     = "0.0.2"
 }
 
 variable "cloudflare_zone_id" {
@@ -45,37 +41,37 @@ variable "cloudflare_zone_id" {
 
 variable "metrics_version" {
   description = "The Metrics version"
-  default = "0.0.8"
+  default     = "0.0.8"
 }
 
 variable "auth_domain" {
   description = "The Auth domain that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "auth_api_audience" {
   description = "The Auth API Audience that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "internal_ui_version" {
-   description = "The Internal UI version"
-   default = "main"
+  description = "The Internal UI version"
+  default     = "main"
 }
 
 variable "national_forecast_version" {
   description = "The National Forecast version"
 }
 
 variable "sentry_monitor_dsn_api" {
-  type = string
+  type        = string
   description = "DSN for Sentry monitoring for the api"
 }
 
 variable "sentry_dsn" {
-  type = string
+  type        = string
   description = "DNS for Sentry monitoring"
-  default=""
+  default     = ""
 }
 
 variable "forecast_pvnet_version" {
@@ -84,7 +80,7 @@ variable "forecast_pvnet_version" {
 
 variable "forecast_pvnet_ecmwf_version" {
   description = "The Forecast PVnet 2.0 ECMWF docker version"
-  default = "2.4.13"
+  default     = "2.4.13"
 }
 
 variable "forecast_blend_version" {
@@ -93,32 +89,32 @@ variable "forecast_blend_version" {
 
 variable "auth_dashboard_client_id" {
   description = "The Auth client id for the dashboard that should be used"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "pvsite_api_version" {
-  type = string
+  type        = string
   description = "This gives the version of the PV Site API"
 }
 
 variable "pvsite_forecast_version" {
-  type = string
+  type        = string
   description = "The version of the PVSite forecaster to use"
 }
 
 variable "database_cleanup_version" {
-  type = string
+  type        = string
   description = "The version of the database clean up to use"
 }
 
 variable "airflow_conn_slack_api_default" {
-  type = string
+  type        = string
   description = "The slack connection string for airflow"
-  default = "not-set"
+  default     = "not-set"
 }
 
 variable "forecast_pvnet_day_ahead_docker_version" {
-  type = string
+  type        = string
   description = "The Forecast PVnet 2.0 day ahead docker version"
-  default = "not-set"
+  default     = "not-set"
 }