Merge pull request #743 from GoogleCloudPlatform/fix_sandboxctl_timeout

Fix sandboxctl destroy timeout

sre-recipes/recipe.py

@@ -66,6 +66,13 @@ def _run_command(command):
         )
         output, error = process.communicate()
         return output, error
+
+    @staticmethod
+    def _run_command_interactive(command):
+        """Runs the given interactive command that waits for user input and returns any output and error"""
+        process = subprocess.run(command.split())
+        return 
+
 
     @staticmethod
     def _get_project_id():

sre-recipes/sandboxctl

@@ -200,7 +200,7 @@ def destroy():
     """Delete an existing sandbox"""
     os.chdir(os.path.abspath(sys.path[0]))
     destroy_command = "../terraform/destroy.sh"
-    Recipe._run_command(destroy_command)
+    Recipe._run_command_interactive(destroy_command)
 
 
 if __name__ == "__main__":

terraform/destroy.sh

@@ -83,7 +83,7 @@ gcloud projects delete $PROJECT_ID
 
 
 # if user backed out or deletion failed, stop script
-found=$(gcloud projects list --filter="${PROJECT_ID}" --format="value(projectId)")
+found=$(gcloud projects describe ${PROJECT_ID} --flatten="lifecycleState" |grep "ACTIVE")
 if [[ -n "${found}" ]]; then
     log "project $PROJECT_ID not deleted"
     sendTelemetry $PROJECT_ID sandbox-not-destroyed