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

EC2 Instance requireImdsv2 fix #32887

Closed
wants to merge 1 commit into from
Closed

Conversation

dil-mocsy
Copy link

Issue # (if applicable)

Closes #32886

#32886

Reason for this change

Prevent EC2 replace when toggling IMDSv2 required to true.

Description of changes

What code changes did you make?

Pre-existing behavior is if a launchTemplate exists then it bails early.
I updated the warning to better explain what's going on.

I removed the creation of a new launchTemplate entirely.
Instead I'm using a pre-existing method to add the option to the metadata.

node.instance.addMetadata('Options', { HttpTokens: 'required' });

Unless there was a previous setting in the template (example json is made up):

    "Options": {
     "RandomOtherOption": "optional"
     "HttpEndpoint": "enabled"
    }

Then it merges them instead of dropping the previous possibly unrelated things using typescript ....

Describe any new or updated permissions being added

No new permissions.

Description of how you validated changes

I copied this part of the code to my stack and instead of this.warn I used console.log

    const cfnResource = node.instance as CfnResource;
    if(!cfnResource.cfnOptions.metadata?.['Options']) {
      node.instance.addMetadata('Options', { HttpTokens: 'required' });
    } else {
      const existingOptions = cfnResource.cfnOptions.metadata!['Options'];
      if(existingOptions.HttpTokens) {
        this.warn(node, `HttpTokens Metadata Option already set: ${existingOptions.HttpTokens}. Overwriting to 'required'`);
      }
      cfnResource.cfnOptions.metadata!['Options'] =
      {
        ...existingOptions,
        HttpTokens: 'required'
      };
    }

Checklist


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

@github-actions github-actions bot added bug This issue is a bug. p2 labels Jan 13, 2025
@aws-cdk-automation aws-cdk-automation requested a review from a team January 13, 2025 11:38
@github-actions github-actions bot added the beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK label Jan 13, 2025
Copy link
Collaborator

@aws-cdk-automation aws-cdk-automation left a comment

Choose a reason for hiding this comment

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

The pull request linter has failed. See the aws-cdk-automation comment below for failure reasons. If you believe this pull request should receive an exemption, please comment and provide a justification.

A comment requesting an exemption should contain the text Exemption Request. Additionally, if clarification is needed add Clarification Request to a comment.

@aws-cdk-automation
Copy link
Collaborator

The pull request linter fails with the following errors:

❌ The title of this pull request does not follow the Conventional Commits format, see https://www.conventionalcommits.org/.
❌ The first word of the pull request title should not be capitalized. If the title starts with a CDK construct, it should be in backticks "``".

PRs must pass status checks before we can provide a meaningful review.

If you would like to request an exemption from the status checks or clarification on feedback, please leave a comment on this PR containing Exemption Request and/or Clarification Request.

@dil-mocsy
Copy link
Author

It may be possible we also want "HttpEndpoint": "enabled" in the template.json

The launchTemplate based code didn't include this, so I skipped too.

@aws-cdk-automation
Copy link
Collaborator

AWS CodeBuild CI Report

  • CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
  • Commit ID: 89e288b
  • Result: FAILED
  • Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

@dil-mocsy
Copy link
Author

This is draft PR at the moment because I'm still testing.

@dil-mocsy
Copy link
Author

Because of aws-cloudformation/cloudformation-coverage-roadmap#655 this PR will never work.

@dil-mocsy dil-mocsy closed this Jan 13, 2025
Copy link

Comments on closed issues and PRs are hard for our team to see.
If you need help, please open a new issue that references this one.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Jan 13, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
beginning-contributor [Pilot] contributed between 0-2 PRs to the CDK bug This issue is a bug. p2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

aws-ec2: requireImdsv2 forces EC2 replacement
2 participants