feat: move analytics to proper s3 bucket (#159)

WalletConnect · Jul 12, 2023 · 88416fb · 88416fb
1 parent a21dce9
commit 88416fb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/terraform/analytics/main.tf b/terraform/analytics/main.tf
@@ -1,3 +1,4 @@
+### TODO: This should be removed once data is migrated
 resource "aws_s3_bucket" "analytics-data-lake_bucket" {
   bucket = "walletconnect.${var.app_name}.${var.environment}.analytics.data-lake"
 }

diff --git a/terraform/analytics/outputs.tf b/terraform/analytics/outputs.tf
@@ -3,11 +3,6 @@ output "bucket-arn" {
   value       = aws_s3_bucket.analytics-data-lake_bucket.arn
 }
 
-output "bucket-name" {
-  description = "The name of the analytics bucket."
-  value       = aws_s3_bucket.analytics-data-lake_bucket.bucket
-}
-
 output "kms-key_arn" {
   description = "The ARN of the KMS key used to encrypt the analytics bucket."
   value       = aws_kms_key.analytics_bucket.arn

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -10,7 +10,8 @@ locals {
   database_url        = "postgres://${module.database_cluster.cluster_master_username}:${module.database_cluster.cluster_master_password}@${module.database_cluster.cluster_endpoint}:${module.database_cluster.cluster_port}/postgres"
   tenant_database_url = "postgres://${module.tenant_database_cluster.cluster_master_username}:${module.tenant_database_cluster.cluster_master_password}@${module.tenant_database_cluster.cluster_endpoint}:${module.tenant_database_cluster.cluster_port}/postgres"
 
-  geoip_db_bucket_name = "${local.environment}.relay.geo.ip.database.private.${local.environment}.walletconnect"
+  geoip_db_bucket_name            = "${local.environment}.relay.geo.ip.database.private.${local.environment}.walletconnect"
+  analytics_data_lake_bucket_name = "walletconnect.data-lake.${local.environment}"
 }
 
 #tflint-ignore: terraform_required_providers,terraform_unused_declarations
@@ -164,8 +165,8 @@ module "ecs" {
 
   aws_otel_collector_ecr_repository_url = data.aws_ecr_repository.aws_otel_collector.repository_url
 
-  analytics_datalake_bucket_name = module.analytics.bucket-name
-  analytics_key_arn              = module.analytics.kms-key_arn
+  analytics_datalake_bucket_name = local.analytics_data_lake_bucket_name
+  analytics_key_arn              = local.environment == "prod" ? "arn:aws:kms:eu-central-1:898587786287:key/06e7c9fd-943d-47bf-bcf4-781b44411ba4" : "arn:aws:kms:eu-central-1:898587786287:key/d1d2f047-b2a3-4f4a-8786-7c87ee83c954"
   analytics_geoip_db_bucket_name = local.geoip_db_bucket_name
   analytics_geoip_db_key         = var.geoip_db_key