Skip to content

Commit 286bdf5

Browse files
authored
Remove unused variables pertaining to step functions from the computation module (#26)
1 parent f2a300e commit 286bdf5

File tree

4 files changed

+10
-29
lines changed

4 files changed

+10
-29
lines changed

main.tf

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,16 @@ module "metaflow-computation" {
7373
resource_prefix = local.resource_prefix
7474
resource_suffix = local.resource_suffix
7575

76-
batch_type = var.batch_type
77-
compute_environment_desired_vcpus = var.compute_environment_desired_vcpus
78-
compute_environment_instance_types = var.compute_environment_instance_types
79-
compute_environment_max_vcpus = var.compute_environment_max_vcpus
80-
compute_environment_min_vcpus = var.compute_environment_min_vcpus
81-
compute_environment_egress_cidr_blocks = var.compute_environment_egress_cidr_blocks
82-
enable_step_functions = var.enable_step_functions
83-
iam_partition = var.iam_partition
84-
metaflow_step_functions_dynamodb_policy = module.metaflow-step-functions.metaflow_step_functions_dynamodb_policy
85-
metaflow_vpc_id = var.vpc_id
86-
subnet1_id = var.subnet1_id
87-
subnet2_id = var.subnet2_id
76+
batch_type = var.batch_type
77+
compute_environment_desired_vcpus = var.compute_environment_desired_vcpus
78+
compute_environment_instance_types = var.compute_environment_instance_types
79+
compute_environment_max_vcpus = var.compute_environment_max_vcpus
80+
compute_environment_min_vcpus = var.compute_environment_min_vcpus
81+
compute_environment_egress_cidr_blocks = var.compute_environment_egress_cidr_blocks
82+
iam_partition = var.iam_partition
83+
metaflow_vpc_id = var.vpc_id
84+
subnet1_id = var.subnet1_id
85+
subnet2_id = var.subnet2_id
8886

8987
standard_tags = var.tags
9088
}

modules/computation/README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,7 @@ To read more, see [the Metaflow docs](https://docs.metaflow.org/metaflow-on-aws/
1818
| <a name="input_compute_environment_instance_types"></a> [compute\_environment\_instance\_types](#input\_compute\_environment\_instance\_types) | The instance types for the compute environment as a comma-separated list | `list(string)` | n/a | yes |
1919
| <a name="input_compute_environment_max_vcpus"></a> [compute\_environment\_max\_vcpus](#input\_compute\_environment\_max\_vcpus) | Maximum VCPUs for Batch Compute Environment [16-96] | `number` | n/a | yes |
2020
| <a name="input_compute_environment_min_vcpus"></a> [compute\_environment\_min\_vcpus](#input\_compute\_environment\_min\_vcpus) | Minimum VCPUs for Batch Compute Environment [0-16] for EC2 Batch Compute Environment (ignored for Fargate) | `number` | n/a | yes |
21-
| <a name="input_enable_step_functions"></a> [enable\_step\_functions](#input\_enable\_step\_functions) | If true, apply policies required for step functions | `bool` | `false` | no |
2221
| <a name="input_iam_partition"></a> [iam\_partition](#input\_iam\_partition) | IAM Partition (Select aws-us-gov for AWS GovCloud, otherwise leave as is) | `string` | `"aws"` | no |
23-
| <a name="input_metaflow_step_functions_dynamodb_policy"></a> [metaflow\_step\_functions\_dynamodb\_policy](#input\_metaflow\_step\_functions\_dynamodb\_policy) | IAM policy allowing access to the step functions dynamodb policy | `string` | n/a | yes |
2422
| <a name="input_metaflow_vpc_id"></a> [metaflow\_vpc\_id](#input\_metaflow\_vpc\_id) | ID of the Metaflow VPC this SageMaker notebook instance is to be deployed in | `string` | n/a | yes |
2523
| <a name="input_resource_prefix"></a> [resource\_prefix](#input\_resource\_prefix) | Prefix given to all AWS resources to differentiate between applications | `string` | n/a | yes |
2624
| <a name="input_resource_suffix"></a> [resource\_suffix](#input\_resource\_suffix) | Suffix given to all AWS resources to differentiate between environment and workspace | `string` | n/a | yes |

modules/computation/data.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,3 @@ data "aws_region" "current" {}
33
data "aws_ssm_parameter" "ecs_optimized_cpu_ami" {
44
name = "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended"
55
}
6-
7-
data "aws_ssm_parameter" "ecs_optimized_gpu_ami" {
8-
name = "/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended"
9-
}

modules/computation/variables.tf

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,23 +30,12 @@ variable "compute_environment_egress_cidr_blocks" {
3030
description = "CIDR blocks to which egress is allowed from the Batch Compute environment's security group"
3131
}
3232

33-
variable "enable_step_functions" {
34-
default = false
35-
description = "If true, apply policies required for step functions"
36-
type = bool
37-
}
38-
3933
variable "iam_partition" {
4034
type = string
4135
default = "aws"
4236
description = "IAM Partition (Select aws-us-gov for AWS GovCloud, otherwise leave as is)"
4337
}
4438

45-
variable "metaflow_step_functions_dynamodb_policy" {
46-
type = string
47-
description = "IAM policy allowing access to the step functions dynamodb policy"
48-
}
49-
5039
variable "resource_prefix" {
5140
type = string
5241
description = "Prefix given to all AWS resources to differentiate between applications"

0 commit comments

Comments
 (0)