diff --git a/main.tf b/main.tf index a247a25a..77674dcb 100644 --- a/main.tf +++ b/main.tf @@ -55,9 +55,9 @@ variable "finance_app_imap_host" {} variable "finance_app_imap_user" {} variable "finance_app_imap_password" {} variable "finance_app_imap_directory" {} -variable "finance_app_monzo_registered_accounts_json" {} variable "finance_app_oauth_google_client_id" {} variable "finance_app_oauth_google_client_secret" {} +variable "finance_app_graphql_api_secret" {} variable "ansible_prefix" { default = "ANSIBLE_VAULT_PASSWORD_FILE=~/.ansible/vault_pass.txt ansible-playbook -i playbook/hosts.yaml playbook/linux.yml -t linux/initial_setup" @@ -269,14 +269,14 @@ module "kubernetes_cluster" { shadowsocks_password = var.shadowsocks_password # finance app - finance_app_monzo_client_id = var.finance_app_monzo_client_id - finance_app_monzo_client_secret = var.finance_app_monzo_client_secret - finance_app_sqlite_db_path = var.finance_app_sqlite_db_path - finance_app_imap_host = var.finance_app_imap_host - finance_app_imap_user = var.finance_app_imap_user - finance_app_imap_password = var.finance_app_imap_password - finance_app_imap_directory = var.finance_app_imap_directory - finance_app_monzo_registered_accounts_json = var.finance_app_monzo_registered_accounts_json - finance_app_oauth_google_client_id = var.finance_app_oauth_google_client_id - finance_app_oauth_google_client_secret = var.finance_app_oauth_google_client_secret + finance_app_monzo_client_id = var.finance_app_monzo_client_id + finance_app_monzo_client_secret = var.finance_app_monzo_client_secret + finance_app_sqlite_db_path = var.finance_app_sqlite_db_path + finance_app_imap_host = var.finance_app_imap_host + finance_app_imap_user = var.finance_app_imap_user + finance_app_imap_password = var.finance_app_imap_password + finance_app_imap_directory = var.finance_app_imap_directory + finance_app_oauth_google_client_id = var.finance_app_oauth_google_client_id + finance_app_oauth_google_client_secret = var.finance_app_oauth_google_client_secret + finance_app_graphql_api_secret = var.finance_app_graphql_api_secret } diff --git a/modules/kubernetes/finance_app/main.tf b/modules/kubernetes/finance_app/main.tf index 21a21d4a..c68185e7 100644 --- a/modules/kubernetes/finance_app/main.tf +++ b/modules/kubernetes/finance_app/main.tf @@ -9,12 +9,9 @@ variable "imap_directory" {} variable "prod_graphql_endpoint" { default = "https://finance.viktorbarzin.me/graphql" } -variable "monzo_registered_accounts_json" {} variable "oauth_google_client_id" {} variable "oauth_google_client_secret" {} -variable "graphql_api_secret" { - default = "kekerino" -} +variable "graphql_api_secret" {} resource "kubernetes_namespace" "finance_app" { @@ -186,10 +183,6 @@ resource "kubernetes_deployment" "finance_app_backend_webhook_handler" { container { image = "viktorbarzin/finance-app-backend-webhook-handler" name = "finance-app-backend-webhook-handler" - env { - name = "MONZO_REGISTERED_ACCOUNTS_JSON" - value = var.monzo_registered_accounts_json - } env { name = "GRAPHQL_ENDPOINT" value = var.prod_graphql_endpoint diff --git a/modules/kubernetes/main.tf b/modules/kubernetes/main.tf index 8713166e..1f194e16 100644 --- a/modules/kubernetes/main.tf +++ b/modules/kubernetes/main.tf @@ -43,9 +43,9 @@ variable "finance_app_imap_host" {} variable "finance_app_imap_user" {} variable "finance_app_imap_password" {} variable "finance_app_imap_directory" {} -variable "finance_app_monzo_registered_accounts_json" {} variable "finance_app_oauth_google_client_id" {} variable "finance_app_oauth_google_client_secret" {} +variable "finance_app_graphql_api_secret" {} resource "null_resource" "core_services" { # List all the core modules that must be provisioned first @@ -259,16 +259,16 @@ module "home_assistant" { } module "finance_app" { - source = "./finance_app" - tls_secret_name = var.tls_secret_name - monzo_client_id = var.finance_app_monzo_client_id - monzo_client_secret = var.finance_app_monzo_client_secret - sqlite_db_path = var.finance_app_sqlite_db_path - imap_host = var.finance_app_imap_host - imap_user = var.finance_app_imap_user - imap_password = var.finance_app_imap_password - imap_directory = var.finance_app_imap_directory - monzo_registered_accounts_json = var.finance_app_monzo_registered_accounts_json - oauth_google_client_id = var.finance_app_oauth_google_client_id - oauth_google_client_secret = var.finance_app_oauth_google_client_secret + source = "./finance_app" + tls_secret_name = var.tls_secret_name + monzo_client_id = var.finance_app_monzo_client_id + monzo_client_secret = var.finance_app_monzo_client_secret + sqlite_db_path = var.finance_app_sqlite_db_path + imap_host = var.finance_app_imap_host + imap_user = var.finance_app_imap_user + imap_password = var.finance_app_imap_password + imap_directory = var.finance_app_imap_directory + oauth_google_client_id = var.finance_app_oauth_google_client_id + oauth_google_client_secret = var.finance_app_oauth_google_client_secret + graphql_api_secret = var.finance_app_graphql_api_secret }