feat(ec2): add nitro enclave and hibernation settings to the Instance Construct by mazyu36 · Pull Request #30228 · aws/aws-cdk

mazyu36 · 2024-05-16T04:30:33Z

Issue # (if applicable)

N/A

Reason for this change

MIssing property in the L2 Construct

Description of changes

Add nitroEnclaveEnabled and hibernationConfigured property.

Description of how you validated changes

Added unit tests and integ tests.

Checklist

My code adheres to the CONTRIBUTING GUIDE and DESIGN GUIDELINES

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

go-to-k

Thanks for the PR. I made some comments!

packages/aws-cdk-lib/aws-ec2/README.md

packages/aws-cdk-lib/aws-ec2/lib/instance.ts

go-to-k · 2024-05-23T11:21:13Z

packages/aws-cdk-lib/aws-ec2/lib/instance.ts

+   *
+   * @default false
+   */
+  readonly hibernationConfigured?: boolean;


Can we change to hibernationEnabled to match enclaveEnabled? (HibernationOptionsProperty in L1 has the configured, but ...)

I changed the property name.

packages/aws-cdk-lib/aws-ec2/lib/instance.ts

go-to-k · 2024-05-23T11:36:59Z

packages/aws-cdk-lib/aws-ec2/test/instance.test.ts

+test.each([
+  [true, true],
+  [false, false],
+])('given nitroEnclaveEnabled %p', (given: boolean, expected: boolean) => {


it needs to change the sentence If we change the parameter name.

Updated to match the parameter name.

go-to-k · 2024-05-23T11:37:42Z

packages/aws-cdk-lib/aws-ec2/test/instance.test.ts

+test.each([
+  [true, true],
+  [false, false],
+])('given hibernationConfigured %p', (given: boolean, expected: boolean) => {


Same as above.

Updated to match the parameter name.

go-to-k · 2024-05-23T11:38:23Z

packages/aws-cdk-lib/aws-ec2/test/instance.test.ts

+  });
+});
+
+test('throw if AWS Nitro Enclaves and hibernation are enabled', () => {


It would be good to use parameter names in the sentence.

I changed the sentence to match parameter names.

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

mazyu36 · 2024-05-23T12:40:12Z

@go-to-k
Thank you for your review!
I've addressed all your comments.

go-to-k

Please check the last comment (That is very very minor)!

packages/aws-cdk-lib/aws-ec2/README.md

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

go-to-k

Thanks!

packages/aws-cdk-lib/aws-ec2/lib/instance.ts

mazyu36 · 2024-06-01T03:49:51Z

@shikha372
Thank you for the review. Sorry for making you go back and forth so many times.
I have revised the integ test again.

mergify · 2024-06-13T20:14:39Z

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

Pull request has been modified.

mazyu36 · 2024-06-14T00:53:40Z

@shikha372
Thank you for the review.
The integration test failed, so I ran it again, and it seems that there is a difference in an area unrelated to this modification. Would it be okay to push again?

  CHANGED    aws-ec2/test/integ.instance-nitro-enclaves-hibernation 0.777s
      Mappings
[+] Mapping LatestNodeRuntimeMap: {"af-south-1":{"value":"nodejs20.x"},"ap-east-1":{"value":"nodejs20.x"},"ap-northeast-1":{"value":"nodejs20.x"},"ap-northeast-2":{"value":"nodejs20.x"},"ap-northeast-3":{"value":"nodejs20.x"},"ap-south-1":{"value":"nodejs20.x"},"ap-south-2":{"value":"nodejs20.x"},"ap-southeast-1":{"value":"nodejs20.x"},"ap-southeast-2":{"value":"nodejs20.x"},"ap-southeast-3":{"value":"nodejs20.x"},"ap-southeast-4":{"value":"nodejs20.x"},"ca-central-1":{"value":"nodejs20.x"},"cn-north-1":{"value":"nodejs18.x"},"cn-northwest-1":{"value":"nodejs18.x"},"eu-central-1":{"value":"nodejs20.x"},"eu-central-2":{"value":"nodejs20.x"},"eu-north-1":{"value":"nodejs20.x"},"eu-south-1":{"value":"nodejs20.x"},"eu-south-2":{"value":"nodejs20.x"},"eu-west-1":{"value":"nodejs20.x"},"eu-west-2":{"value":"nodejs20.x"},"eu-west-3":{"value":"nodejs20.x"},"il-central-1":{"value":"nodejs20.x"},"me-central-1":{"value":"nodejs20.x"},"me-south-1":{"value":"nodejs20.x"},"sa-east-1":{"value":"nodejs20.x"},"us-east-1":{"value":"nodejs20.x"},"us-east-2":{"value":"nodejs20.x"},"us-gov-east-1":{"value":"nodejs18.x"},"us-gov-west-1":{"value":"nodejs18.x"},"us-iso-east-1":{"value":"nodejs18.x"},"us-iso-west-1":{"value":"nodejs18.x"},"us-isob-east-1":{"value":"nodejs18.x"},"us-west-1":{"value":"nodejs20.x"},"us-west-2":{"value":"nodejs20.x"}}

Resources
[~] AWS::Lambda::Function CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E 
 └─ [~] Runtime
     └─ @@ -1,1 +1,9 @@
        [-] "nodejs18.x"
        [+] {
        [+]   "Fn::FindInMap": [
        [+]     "LatestNodeRuntimeMap",
        [+]     {
        [+]       "Ref": "AWS::Region"
        [+]     },
        [+]     "value"
        [+]   ]
        [+] }

shikha372 · 2024-06-14T00:56:54Z

@shikha372 Thank you for the review. The integration test failed, so I ran it again, and it seems that there is a difference in an area unrelated to this modification. Would it be okay to push again?

  CHANGED    aws-ec2/test/integ.instance-nitro-enclaves-hibernation 0.777s
      Mappings
[+] Mapping LatestNodeRuntimeMap: {"af-south-1":{"value":"nodejs20.x"},"ap-east-1":{"value":"nodejs20.x"},"ap-northeast-1":{"value":"nodejs20.x"},"ap-northeast-2":{"value":"nodejs20.x"},"ap-northeast-3":{"value":"nodejs20.x"},"ap-south-1":{"value":"nodejs20.x"},"ap-south-2":{"value":"nodejs20.x"},"ap-southeast-1":{"value":"nodejs20.x"},"ap-southeast-2":{"value":"nodejs20.x"},"ap-southeast-3":{"value":"nodejs20.x"},"ap-southeast-4":{"value":"nodejs20.x"},"ca-central-1":{"value":"nodejs20.x"},"cn-north-1":{"value":"nodejs18.x"},"cn-northwest-1":{"value":"nodejs18.x"},"eu-central-1":{"value":"nodejs20.x"},"eu-central-2":{"value":"nodejs20.x"},"eu-north-1":{"value":"nodejs20.x"},"eu-south-1":{"value":"nodejs20.x"},"eu-south-2":{"value":"nodejs20.x"},"eu-west-1":{"value":"nodejs20.x"},"eu-west-2":{"value":"nodejs20.x"},"eu-west-3":{"value":"nodejs20.x"},"il-central-1":{"value":"nodejs20.x"},"me-central-1":{"value":"nodejs20.x"},"me-south-1":{"value":"nodejs20.x"},"sa-east-1":{"value":"nodejs20.x"},"us-east-1":{"value":"nodejs20.x"},"us-east-2":{"value":"nodejs20.x"},"us-gov-east-1":{"value":"nodejs18.x"},"us-gov-west-1":{"value":"nodejs18.x"},"us-iso-east-1":{"value":"nodejs18.x"},"us-iso-west-1":{"value":"nodejs18.x"},"us-isob-east-1":{"value":"nodejs18.x"},"us-west-1":{"value":"nodejs20.x"},"us-west-2":{"value":"nodejs20.x"}}

Resources
[~] AWS::Lambda::Function CustomVpcRestrictDefaultSGCustomResourceProviderHandlerDC833E5E 
 └─ [~] Runtime
     └─ @@ -1,1 +1,9 @@
        [-] "nodejs18.x"
        [+] {
        [+]   "Fn::FindInMap": [
        [+]     "LatestNodeRuntimeMap",
        [+]     {
        [+]       "Ref": "AWS::Region"
        [+]     },
        [+]     "value"
        [+]   ]
        [+] }

i see, yes this is expected after latest commit, integ test needs to be rerun and updated in this case.

mazyu36 · 2024-06-14T01:48:42Z

@shikha372
Thank you. I have fixed the integration test.
Could you please review and approve it again?

shikha372 · 2024-06-14T03:39:51Z

@Mergifyio update

mergify · 2024-06-14T03:40:00Z

update

✅ Branch has been successfully updated

aws-cdk-automation · 2024-06-14T04:10:35Z

AWS CodeBuild CI Report

CodeBuild project: AutoBuildv2Project1C6BFA3F-wQm2hXv2jqQv
Commit ID: fcd38fd
Result: SUCCEEDED
Build Logs (available for 30 days)

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

mergify · 2024-06-14T17:43:32Z

Thank you for contributing! Your pull request will be updated from main and then merged automatically (do not update manually, and be sure to allow changes to be pushed to your fork).

… Construct (aws#30228) ### Issue # (if applicable) N/A ### Reason for this change MIssing property in the L2 Construct ### Description of changes Add nitroEnclaveEnabled and hibernationConfigured property. ### Description of how you validated changes Added unit tests and integ tests. ### Checklist - [x] My code adheres to the [CONTRIBUTING GUIDE](https://github.com/aws/aws-cdk/blob/main/CONTRIBUTING.md) and [DESIGN GUIDELINES](https://github.com/aws/aws-cdk/blob/main/docs/DESIGN_GUIDELINES.md) ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*

aws-cdk-automation · 2024-07-25T21:08:01Z

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.

AWS CDK Team and others added 4 commits May 16, 2024 13:18

chore(release): 2.142.0

31896af

feat: add nitroEnclave and hibenartion

b0b71aa

Merge branch 'main' into ec2-enclave-hibernation

50ef96d

fix update README

73b1f15

aws-cdk-automation requested a review from a team May 16, 2024 04:30

github-actions bot added p2 repeat-contributor [Pilot] contributed between 3-5 PRs to the CDK labels May 16, 2024

fix: README

d978fc8

aws-cdk-automation added the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label May 16, 2024

github-actions bot mentioned this pull request May 20, 2024

Weekly PR metrics report #30274

Closed

go-to-k suggested changes May 23, 2024

View reviewed changes

mazyu36 and others added 11 commits May 23, 2024 20:45

Merge branch 'main' into ec2-enclave-hibernation

ab58bf6

Update packages/aws-cdk-lib/aws-ec2/README.md

e6e209e

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/lib/instance.ts

ef219e8

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/lib/instance.ts

21be6d4

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/lib/instance.ts

f7c0284

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/lib/instance.ts

3d1533b

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/README.md

5ac126f

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/README.md

2cacc1f

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/README.md

b6821b6

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

Update packages/aws-cdk-lib/aws-ec2/lib/instance.ts

90792c4

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

fix: Incorporate review comments

3595648

aws-cdk-automation removed the pr/needs-community-review This PR needs a review from a Trusted Community Member or Core Team Member. label May 23, 2024

go-to-k suggested changes May 23, 2024

View reviewed changes

packages/aws-cdk-lib/aws-ec2/README.md Show resolved Hide resolved

Update packages/aws-cdk-lib/aws-ec2/README.md

3073387

Co-authored-by: k.goto (Kenta Goto) <24818752+go-to-k@users.noreply.github.com>

go-to-k approved these changes May 23, 2024

View reviewed changes

aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label May 23, 2024

shikha372 self-assigned this May 24, 2024

shikha372 reviewed May 25, 2024

View reviewed changes

packages/aws-cdk-lib/aws-ec2/lib/instance.ts Show resolved Hide resolved

shikha372 previously approved these changes Jun 13, 2024

View reviewed changes

Merge branch 'main' into ec2-enclave-hibernation

3dcadd4

aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jun 13, 2024

Merge branch 'main' into ec2-enclave-hibernation

310b710

fix: update integ test

e204709

aws-cdk-automation added the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jun 14, 2024

Merge branch 'main' into ec2-enclave-hibernation

fcd38fd

shikha372 approved these changes Jun 14, 2024

View reviewed changes

mergify bot merged commit 4e9ef15 into aws:main Jun 14, 2024

aws-cdk-automation removed the pr/needs-maintainer-review This PR needs a review from a Core Team Member label Jun 14, 2024

mazyu36 deleted the ec2-enclave-hibernation branch June 18, 2024 14:37

This was referenced Jul 12, 2024

[Snyk] Upgrade: , aws-cdk NOUIY/aws-solutions-constructs#108

Open

[Snyk] Upgrade: , aws-cdk NOUIY/aws-solutions-constructs#109

Open

This was referenced Jul 19, 2024

[Snyk] Upgrade: , aws-cdk NOUIY/aws-solutions-constructs#110

Open

[Snyk] Upgrade: , aws-cdk NOUIY/aws-solutions-constructs#111

Open

aws locked as resolved and limited conversation to collaborators Jul 25, 2024

Conversation

mazyu36 commented May 16, 2024

Issue # (if applicable)

Reason for this change

Description of changes

Description of how you validated changes

Checklist

Uh oh!

go-to-k left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mazyu36 commented May 23, 2024

Uh oh!

go-to-k left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

go-to-k left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

mazyu36 commented Jun 1, 2024

Uh oh!

mergify bot commented Jun 13, 2024

Uh oh!

mazyu36 commented Jun 14, 2024

Uh oh!

shikha372 commented Jun 14, 2024

Uh oh!

mazyu36 commented Jun 14, 2024

Uh oh!

shikha372 commented Jun 14, 2024

Uh oh!

mergify bot commented Jun 14, 2024

✅ Branch has been successfully updated

Uh oh!

aws-cdk-automation commented Jun 14, 2024

AWS CodeBuild CI Report

Uh oh!

mergify bot commented Jun 14, 2024

Uh oh!

aws-cdk-automation commented Jul 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

go-to-k left a comment •

edited

Loading