Skip to content
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

Fix ECS cluster ARN attribute name/value for aws_batch_compute_environment resource #1809

Merged
merged 2 commits into from
Oct 5, 2017
Merged

Fix ECS cluster ARN attribute name/value for aws_batch_compute_environment resource #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a49dc0
Fix ECS cluster ARN attribute name/value
rxacevedo Oct 4, 2017
1bd599a
Allow both ecc/ecs attribute names, add deprecation warning
rxacevedo Oct 4, 2017
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
8 changes: 7 additions & 1 deletion aws/resource_aws_batch_compute_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ func resourceAwsBatchComputeEnvironment() *schema.Resource {
Computed: true,
},
"ecc_cluster_arn": {
Type: schema.TypeString,
Computed: true,
Deprecated: "Use ecs_cluster_arn instead",
},
"ecs_cluster_arn": {
Type: schema.TypeString,
Computed: true,
},
Expand Down Expand Up @@ -266,7 +271,8 @@ func resourceAwsBatchComputeEnvironmentRead(d *schema.ResourceData, meta interfa
}

d.Set("arn", computeEnvironment.ComputeEnvironmentArn)
d.Set("ecc_cluster_arn", computeEnvironment.ComputeEnvironmentArn)
d.Set("ecc_cluster_arn", computeEnvironment.EcsClusterArn)
d.Set("ecs_cluster_arn", computeEnvironment.EcsClusterArn)
d.Set("status", computeEnvironment.Status)
d.Set("status_reason", computeEnvironment.StatusReason)

Expand Down
2 changes: 1 addition & 1 deletion website/docs/r/batch_compute_environment.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ resource "aws_batch_compute_environment" "sample" {
## Attributes Reference

* `arn` - The Amazon Resource Name (ARN) of the compute environment.
* `ecc_cluster_arn` - The Amazon Resource Name (ARN) of the underlying Amazon ECS cluster used by the compute environment.
* `ecs_cluster_arn` - The Amazon Resource Name (ARN) of the underlying Amazon ECS cluster used by the compute environment.
* `status` - The current status of the compute environment (for example, CREATING or VALID).
* `status_reason` - A short, human-readable string to provide additional details about the current status of the compute environment.

Expand Down