Merge branch 'fix-instance-destroy' into ndharasz/1.1.4

Author: joshterrill

numerai/cli/destroy_all.py

@@ -62,7 +62,7 @@ def destroy_all(ctx, verbose, preserve_node_config):
                 verbose,
                 provider,
                 env_vars=provider_keys,
-                inputs={"node_config_file": "nodes.json"},
+                inputs={"node_config_file": "../nodes.json"},
             )
 
     except Exception as e:

numerai/cli/node/destroy.py

@@ -62,7 +62,7 @@ def destroy(ctx, preserve_node_config, verbose):
             verbose,
             provider,
             env_vars=provider_keys,
-            inputs={"node_config_file": "nodes.json"},
+            inputs={"node_config_file": "../nodes.json"},
         )
 
     except Exception as e:

numerai/cli/uninstall.py

@@ -55,7 +55,7 @@ def uninstall():
                         provider=provider,
                         verbose=True,
                         env_vars=provider_keys,
-                        inputs={"node_config_file": "nodes.json"},
+                        inputs={"node_config_file": "../nodes.json"},
                     )
 
             click.secho("cleaning up docker images...")

numerai/cli/upgrade.py

@@ -210,7 +210,7 @@ def upgrade(verbose):
             verbose,
             provider="aws",
             env_vars=load_or_init_keys("aws"),
-            inputs={"node_config_file": "nodes.json"},
+            inputs={"node_config_file": "../nodes.json"},
         )
 
     click.secho("Upgrade complete!", fg="green")

numerai/cli/util/terraform.py

@@ -19,7 +19,7 @@ def apply_terraform(nodes_config, affected_providers, provider, verbose):
                 verbose,
                 affected_provider,
                 env_vars=load_or_init_keys(affected_provider),
-                inputs={"node_config_file": "nodes.json"},
+                inputs={"node_config_file": "../nodes.json"},
             )
         else:
             click.secho(f"provider {affected_provider} not supported", fg="red")
@@ -51,7 +51,7 @@ def create_azure_registry(provider, provider_keys, verbose):
         verbose,
         "azure",
         env_vars=provider_keys,
-        inputs={"node_config_file": "nodes.json"},
+        inputs={"node_config_file": "../nodes.json"},
     )
     res = terraform("output -json acr_repo_details", True, provider).decode("utf-8")
     return json.loads(res)
@@ -64,13 +64,13 @@ def create_gcp_registry(provider, verbose):
         'apply -target="google_project_service.cloud_resource_manager" -auto-approve ',
         verbose,
         "gcp",
-        inputs={"node_config_file": "nodes.json"},
+        inputs={"node_config_file": "../nodes.json"},
     )
     terraform(
         'apply -target="google_artifact_registry_repository.registry[0]" -auto-approve ',
         verbose,
         "gcp",
-        inputs={"node_config_file": "nodes.json"},
+        inputs={"node_config_file": "../nodes.json"},
     )
     res = terraform("output -json artifact_registry_details", True, provider).decode(
         "utf-8"

numerai/terraform/aws/-inputs.tf

@@ -13,7 +13,7 @@ variable "az_count" {
 variable "node_config_file" {
   description = "Path to the json file used to configure nodes"
   type        = string
-  default     = "nodes.json"
+  default     = "../nodes.json"
 }
 
 variable "node_container_port" {

numerai/terraform/aws/aws/cluster.tf

@@ -110,7 +110,7 @@ resource "aws_launch_template" "node" {
 }
 
 resource "aws_batch_compute_environment" "node" {
-  compute_environment_name_prefix = "${local.node_prefix}-"
+  compute_environment_name = "${local.node_prefix}-compute"
 
   compute_resources {
     instance_role = aws_iam_instance_profile.batch_ecs_instance_role.arn

numerai/terraform/azure/input.tf

@@ -9,7 +9,7 @@ variable "az_resource_group_location" {
 variable "node_config_file" {
   description = "Path to the json file used to configure nodes"
   type        = string
-  default     = "nodes.json"
+  default     = "../nodes.json"
 }
 
 variable "node_container_port" {

numerai/terraform/gcp/-inputs.tf

@@ -7,5 +7,5 @@ variable "region" {
 variable "node_config_file" {
   description = "Path to the json file used to configure nodes"
   type        = string
-  default     = "nodes.json"
+  default     = "../nodes.json"
 }