Skip to content

Remove unused variables pertaining to step functions from the computation module #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 6, 2022
Merged

Remove unused variables pertaining to step functions from the computation module #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,16 @@ module "metaflow-computation" {
resource_prefix = local.resource_prefix
resource_suffix = local.resource_suffix

batch_type = var.batch_type
compute_environment_desired_vcpus = var.compute_environment_desired_vcpus
compute_environment_instance_types = var.compute_environment_instance_types
compute_environment_max_vcpus = var.compute_environment_max_vcpus
compute_environment_min_vcpus = var.compute_environment_min_vcpus
compute_environment_egress_cidr_blocks = var.compute_environment_egress_cidr_blocks
enable_step_functions = var.enable_step_functions
iam_partition = var.iam_partition
metaflow_step_functions_dynamodb_policy = module.metaflow-step-functions.metaflow_step_functions_dynamodb_policy
metaflow_vpc_id = var.vpc_id
subnet1_id = var.subnet1_id
subnet2_id = var.subnet2_id
batch_type = var.batch_type
compute_environment_desired_vcpus = var.compute_environment_desired_vcpus
compute_environment_instance_types = var.compute_environment_instance_types
compute_environment_max_vcpus = var.compute_environment_max_vcpus
compute_environment_min_vcpus = var.compute_environment_min_vcpus
compute_environment_egress_cidr_blocks = var.compute_environment_egress_cidr_blocks
iam_partition = var.iam_partition
metaflow_vpc_id = var.vpc_id
subnet1_id = var.subnet1_id
subnet2_id = var.subnet2_id

standard_tags = var.tags
}
Expand Down
2 changes: 0 additions & 2 deletions modules/computation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ To read more, see [the Metaflow docs](https://docs.metaflow.org/metaflow-on-aws/
| <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 |
| <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 |
| <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 |
| <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 |
| <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 |
| <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 |
| <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 |
| <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 |
| <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 |
Expand Down
4 changes: 0 additions & 4 deletions modules/computation/data.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,3 @@ data "aws_region" "current" {}
data "aws_ssm_parameter" "ecs_optimized_cpu_ami" {
name = "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended"
}

data "aws_ssm_parameter" "ecs_optimized_gpu_ami" {
name = "/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended"
}
11 changes: 0 additions & 11 deletions modules/computation/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,12 @@ variable "compute_environment_egress_cidr_blocks" {
description = "CIDR blocks to which egress is allowed from the Batch Compute environment's security group"
}

variable "enable_step_functions" {
default = false
description = "If true, apply policies required for step functions"
type = bool
}

variable "iam_partition" {
type = string
default = "aws"
description = "IAM Partition (Select aws-us-gov for AWS GovCloud, otherwise leave as is)"
}

variable "metaflow_step_functions_dynamodb_policy" {
type = string
description = "IAM policy allowing access to the step functions dynamodb policy"
}

variable "resource_prefix" {
type = string
description = "Prefix given to all AWS resources to differentiate between applications"
Expand Down