From a4cc0c3cd176b70b89a748f5237044f23b82df9d Mon Sep 17 00:00:00 2001
From: Avritt Rohwer <avritt@google.com>
Date: Wed, 26 Oct 2022 14:59:59 -0700
Subject: [PATCH 1/2] Add rover command

---
 cloud/cloud.Dockerfile    |  1 +
 cloud/shared/bin/rover.py | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 cloud/shared/bin/rover.py

diff --git a/cloud/cloud.Dockerfile b/cloud/cloud.Dockerfile
index e556af80..0403d2ef 100644
--- a/cloud/cloud.Dockerfile
+++ b/cloud/cloud.Dockerfile
@@ -10,6 +10,7 @@ FROM bellsoft/liberica-openjre-debian:11.0.16-8 as arm64
 FROM ${TARGETARCH}
 
 COPY --from=hashicorp/terraform:1.3.3 /bin/terraform /usr/local/bin/
+COPY --from=im2nguyen/rover:v0.3.3 /bin/rover /usr/local/bin/
 COPY --from=amazon/aws-cli:2.8.4 /usr/local /usr/local
 COPY --from=amazon/aws-cli:2.8.4 /aws /aws
 # TODO(#3222): Add Azure CLI and make sure It works with arm64.
diff --git a/cloud/shared/bin/rover.py b/cloud/shared/bin/rover.py
new file mode 100644
index 00000000..193789e0
--- /dev/null
+++ b/cloud/shared/bin/rover.py
@@ -0,0 +1,19 @@
+"""
+Run rover.
+"""
+
+import subprocess
+from typing import List
+from cloud.shared.bin.lib.config_loader import ConfigLoader
+
+
+def run(config: ConfigLoader, params: List[str]):
+    td = config.get_template_dir()
+    subprocess.check_call(
+        [
+            "rover",
+            f"-workingDir=/{td}",
+            f"-tfBackendConfig=/{td}/backend_vars",
+            f"-tfVarsFile=/{td}/setup.auto.tfvars",
+        ]
+    )

From 8e87b3360fc537e11efd16652cd5ca286548d3c9 Mon Sep 17 00:00:00 2001
From: Avritt Rohwer <avritt@google.com>
Date: Fri, 28 Oct 2022 17:30:51 -0700
Subject: [PATCH 2/2] Read terraform vars file and backend config from config
 loader

---
 cloud/shared/bin/rover.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cloud/shared/bin/rover.py b/cloud/shared/bin/rover.py
index 193789e0..2b6ac4ad 100644
--- a/cloud/shared/bin/rover.py
+++ b/cloud/shared/bin/rover.py
@@ -13,7 +13,7 @@ def run(config: ConfigLoader, params: List[str]):
         [
             "rover",
             f"-workingDir=/{td}",
-            f"-tfBackendConfig=/{td}/backend_vars",
-            f"-tfVarsFile=/{td}/setup.auto.tfvars",
+            f"-tfVarsFile=/{td}/{config.tfvars_filename}",
+            f"-tfBackendConfig=/{td}/{config.backend_vars_filename}",
         ]
     )