remove S3 TF variables

gpii-ops · Mar 12, 2019 · 24ba2b8 · 24ba2b8
1 parent fcba207
commit 24ba2b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/gcp/modules/backup-exporter/main.tf b/gcp/modules/backup-exporter/main.tf
@@ -4,14 +4,10 @@ terraform {
 
 variable "secrets_dir" {}
 variable "charts_dir" {}
+variable "destination_bucket" {}
 
 # Terragrunt variables
 
-# Secret variables
-
-variable "aws_access_key_id" {}
-variable "aws_secret_access_key" {}
-
 variable "service_account_name" {
   default = "backup-exporter@${var.project_id}.iam.gserviceaccount.com"
 }
@@ -24,7 +20,7 @@ data "template_file" "backup-exporter" {
     aws_secret_access_key = "${var.aws_secret_access_key}"
     service_account_json  = "${google_service_account_key.service_account_json.private_key}"
     service_account_name  = "${var.service_account_name}"
-    s3_bucket             = "s3://${var.project_id}"
+    destination_bucket    = "${var.destination_bucket}"
   }
 }
 

diff --git a/gcp/modules/backup-exporter/values.yaml b/gcp/modules/backup-exporter/values.yaml
@@ -7,8 +7,6 @@ issuerRef:
 serviceAccountName: "${service_account_name}"
 serviceAccountJson: "${service_account_json}"
 
-AwsSecretKeyId: "${aws_secret_key_id}"
-AwsSecretAccessKey: "${aws_secret_access_key}"
-S3Bucket: "${s3_bucket}"
+DestinationBucket: "${destination_bucket}"
 
 schedule: "*/5 * * * *"