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.

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): correct logic of healthcheck command #2462

Merged
merged 1 commit into from
May 6, 2019
Merged

fix(ecs): correct logic of healthcheck command #2462

merged 1 commit into from
May 6, 2019

Conversation

ChrisLahaye
Copy link

@ChrisLahaye ChrisLahaye commented May 2, 2019

Adding a healthcheck command to an ECS container definition
results in an invalid command after synthesizing.

Before:

Input: ['CMD', 'command']
Output:
      HealthCheck:
        Command:
          - CMD
          - CMD
          - echo
          - z

Input: ['CMD-SHELL', 'command']
Output:
      HealthCheck:
        Command:
          - CMD
          - CMD-SHELL
          - echo
          - z

After:

Input: ['CMD', 'command']
Output:
      HealthCheck:
        Command:
          - CMD
          - echo
          - z

Input: ['CMD-SHELL', 'command']
Output:
      HealthCheck:
        Command:
          - CMD-SHELL
          - echo
          - z

fixes #2461

Signed-off-by: Chris Lahaye dev@chrislahaye.com


Pull Request Checklist

  • Testing
    • Unit test added (prefer not to modify an existing test, otherwise, it's probably a breaking change)
    • CLI change?: coordinate update of integration tests with team
    • cdk-init template change?: coordinated update of integration tests with team
  • Docs
    • jsdocs: All public APIs documented
    • README: README and/or documentation topic updated
    • Design: For significant features, design document added to design folder
  • Title and Description
    • Change type: title prefixed with fix, feat and module name in parens, which will appear in changelog
    • Title: use lower-case and doesn't end with a period
    • Breaking?: last paragraph: "BREAKING CHANGE: <describe what changed + link for details>"
    • Issues: Indicate issues fixed via: "Fixes #xxx" or "Closes #xxx"
  • Sensitive Modules (requires 2 PR approvers)
    • IAM Policy Document (in @aws-cdk/aws-iam)
    • EC2 Security Groups and ACLs (in @aws-cdk/aws-ec2)
    • Grant APIs (only if not based on official documentation with a reference)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license.

Adding a healthcheck command to an ECS container definition
results in an invalid command after synthesizing.

Before:

    Input: ['CMD', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - CMD
              - echo
              - z

    Input: ['CMD-SHELL', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - CMD-SHELL
              - echo
              - z

After:

    Input: ['CMD', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - echo
              - z

    Input: ['CMD-SHELL', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD-SHELL
              - echo
              - z

fixes #2461

Signed-off-by: Chris Lahaye <dev@chrislahaye.com>
@ChrisLahaye ChrisLahaye requested review from SoManyHs and a team as code owners May 2, 2019 19:04
Copy link
Contributor

@SoManyHs SoManyHs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for fixing!

@@ -478,7 +478,7 @@ function getHealthCheckCommand(hc: HealthCheck): string[] {
return hcCommand;
}

if (cmd[0] !== "CMD" || cmd[0] !== 'CMD-SHELL') {
if (cmd[0] !== "CMD" && cmd[0] !== 'CMD-SHELL') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add a unit test to ensure that this check is working as expected?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pkandasamy91 the existing test should be sufficient.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will add missing tests in a separate PR.

@rix0rrr rix0rrr merged commit fa29d3b into aws:master May 6, 2019
SanderKnape pushed a commit to SanderKnape/aws-cdk that referenced this pull request May 14, 2019
Adding a healthcheck command to an ECS container definition
results in an invalid command after synthesizing.

Before:

    Input: ['CMD', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - CMD
              - echo
              - z

    Input: ['CMD-SHELL', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - CMD-SHELL
              - echo
              - z

After:

    Input: ['CMD', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD
              - echo
              - z

    Input: ['CMD-SHELL', 'command']
    Output:
          HealthCheck:
            Command:
              - CMD-SHELL
              - echo
              - z

fixes aws#2461

Signed-off-by: Chris Lahaye <dev@chrislahaye.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ecs] Healthcheck command always prepends CMD
4 participants