From 5c6e131ea7b3709e83b056711749e20e9fb6a01f Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Thu, 20 Feb 2020 20:36:33 -0500
Subject: [PATCH] allow using existing payment method. rename errbit vars to
 error

---
 automation/roles/bubble/files/bubble_role.json            | 8 ++++----
 automation/roles/bubble/templates/bubble.env.j2           | 6 +++---
 .../java/bubble/service/cloud/AnsiblePrepService.java     | 6 +++---
 .../src/main/resources/ansible/default_roles.json         | 8 ++++----
 .../en_US/server/post_auth/ResourceMessages.properties    | 3 ++-
 bubble-web                                                | 2 +-
 6 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/automation/roles/bubble/files/bubble_role.json b/automation/roles/bubble/files/bubble_role.json
index 1dcc540c..6b12a45c 100644
--- a/automation/roles/bubble/files/bubble_role.json
+++ b/automation/roles/bubble/files/bubble_role.json
@@ -27,10 +27,10 @@
     {"name": "restore_key", "value": "[[restoreKey]]"},
     {"name": "restore_timeout", "value": "[[restoreTimeoutSeconds]]"},
     {"name": "test_mode", "value": "[[testMode]]"},
-    {"name": "errbit_url", "value": "[[errbit_url]]"},
-    {"name": "errbit_key", "value": "[[errbit_key]]"},
-    {"name": "errbit_env", "value": "[[errbit_env]]"}
+    {"name": "error_url", "value": "[[error_url]]"},
+    {"name": "error_key", "value": "[[error_key]]"},
+    {"name": "error_env", "value": "[[error_env]]"}
   ],
-  "optionalConfigNames": ["restore_key", "restore_timeout", "errbit_url", "errbit_key", "errbit_env"],
+  "optionalConfigNames": ["restore_key", "restore_timeout", "error_url", "error_key", "error_env"],
   "tgzB64": ""
 }
\ No newline at end of file
diff --git a/automation/roles/bubble/templates/bubble.env.j2 b/automation/roles/bubble/templates/bubble.env.j2
index fd38359b..19c47f68 100644
--- a/automation/roles/bubble/templates/bubble.env.j2
+++ b/automation/roles/bubble/templates/bubble.env.j2
@@ -7,6 +7,6 @@ export LETSENCRYPT_EMAIL={{ letsencrypt_email }}
 export BUBBLE_SERVER_PORT={{ admin_port }}
 export BUBBLE_TEST_MODE={{ test_mode }}
 export BUBBLE_DEFAULT_LOCALE={{ default_locale }}
-export ERRBIT_URL={{ errbit_url | default('') }}
-export ERRBIT_KEY={{ errbit_key | default('') }}
-export ERRBIT_ENV={{ errbit_env | default('') }}
+export ERRBIT_URL={{ error_url | default('') }}
+export ERRBIT_KEY={{ error_key | default('') }}
+export ERRBIT_ENV={{ error_env | default('') }}
diff --git a/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java b/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java
index 09fbe83d..5576db9e 100644
--- a/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java
+++ b/bubble-server/src/main/java/bubble/service/cloud/AnsiblePrepService.java
@@ -83,9 +83,9 @@ public class AnsiblePrepService {
 
         if (network.sendMetrics() && configuration.hasErrorApi()) {
             final ErrorApiConfiguration errorApi = configuration.getErrorApi();
-            ctx.put("errbit_url", errorApi.getUrl());
-            ctx.put("errbit_key", errorApi.getKey());
-            ctx.put("errbit_env", node.getFqdn());
+            ctx.put("error_url", errorApi.getUrl());
+            ctx.put("error_key", errorApi.getKey());
+            ctx.put("error_env", node.getFqdn());
         }
 
         ctx.put("network", network);
diff --git a/bubble-server/src/main/resources/ansible/default_roles.json b/bubble-server/src/main/resources/ansible/default_roles.json
index bfe33f21..4e4c5f70 100644
--- a/bubble-server/src/main/resources/ansible/default_roles.json
+++ b/bubble-server/src/main/resources/ansible/default_roles.json
@@ -48,11 +48,11 @@
       {"name": "restore_key", "value": "[[restoreKey]]"},
       {"name": "restore_timeout", "value": "[[restoreTimeoutSeconds]]"},
       {"name": "test_mode", "value": "[[testMode]]"},
-      {"name": "errbit_url", "value": "[[errbit_url]]"},
-      {"name": "errbit_key", "value": "[[errbit_key]]"},
-      {"name": "errbit_env", "value": "[[errbit_env]]"}
+      {"name": "error_url", "value": "[[error_url]]"},
+      {"name": "error_key", "value": "[[error_key]]"},
+      {"name": "error_env", "value": "[[error_env]]"}
     ],
-    "optionalConfigNames": ["restore_key", "restore_timeout", "errbit_url", "errbit_key", "errbit_env"],
+    "optionalConfigNames": ["restore_key", "restore_timeout", "error_url", "error_key", "error_env"],
     "tgzB64": ""
   },
   {
diff --git a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
index f6687aa1..efd95618 100644
--- a/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
+++ b/bubble-server/src/main/resources/message_templates/en_US/server/post_auth/ResourceMessages.properties
@@ -211,7 +211,8 @@ field_label_network_ssh_key=SSH Key
 field_description_network_ssh_key=You can SSH into the Bubble with this key
 message_network_ssh_key_do_not_install=Do not install any SSH key
 field_label_send_metrics=Send error reports and usage statistics
-field_label_paymentMethod=Payment
+field_label_newPaymentMethod=Add a Payment Method
+field_label_existingPaymentMethod=Payment Method
 err_noPaymentMethods=No payment methods are configured. Contact the administrator of this system.
 msg_km_distance_away=km away
 message_auto_detecting=Auto-Detecting... <small>(refresh page if this gets stuck)</small>
diff --git a/bubble-web b/bubble-web
index c1b97ea3..531e2382 160000
--- a/bubble-web
+++ b/bubble-web
@@ -1 +1 @@
-Subproject commit c1b97ea319adae8dcf536d094ffaa20231d8f744
+Subproject commit 531e2382678ee6c9f33135b914e3b3585704adcc