From 24f1d8f485beb20e7549fc6e2e31fa51e53c12c9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 12 Jun 2020 14:29:32 +0900 Subject: [PATCH] fix: update ec2-types (#246) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- src/constants/ec2-types.ts | 21 ++++++- test/__snapshots__/cli.spec.ts.snap | 96 ++++++++++++++++------------- 2 files changed, 72 insertions(+), 45 deletions(-) diff --git a/src/constants/ec2-types.ts b/src/constants/ec2-types.ts index c2b21133..f3ddcbf7 100644 --- a/src/constants/ec2-types.ts +++ b/src/constants/ec2-types.ts @@ -17,7 +17,7 @@ export const instanceFamilyGeneral = [ 'm6g', ] as const; -export const instanceFamilyCompute = ['c1', 'c3', 'c4', 'c5', 'c5a', 'c5d', 'c5n'] as const; +export const instanceFamilyCompute = ['c1', 'c3', 'c4', 'c5', 'c5a', 'c5d', 'c5n', 'c6g'] as const; export const instanceFamilyMemory = [ 'r3', @@ -28,6 +28,7 @@ export const instanceFamilyMemory = [ 'r5d', 'r5dn', 'r5n', + 'r6g', 'x1', 'x1e', 'z1d', @@ -239,6 +240,15 @@ export const allInstances = [ 'c5n.9xlarge', 'c5n.18xlarge', 'c5n.metal', + 'c6g.medium', + 'c6g.large', + 'c6g.xlarge', + 'c6g.2xlarge', + 'c6g.4xlarge', + 'c6g.8xlarge', + 'c6g.12xlarge', + 'c6g.16xlarge', + 'c6g.metal', 'r3.large', 'r3.xlarge', 'r3.2xlarge', @@ -300,6 +310,15 @@ export const allInstances = [ 'r5n.12xlarge', 'r5n.16xlarge', 'r5n.24xlarge', + 'r6g.medium', + 'r6g.large', + 'r6g.xlarge', + 'r6g.2xlarge', + 'r6g.4xlarge', + 'r6g.8xlarge', + 'r6g.12xlarge', + 'r6g.16xlarge', + 'r6g.metal', 'x1.16xlarge', 'x1.32xlarge', 'x1e.xlarge', diff --git a/test/__snapshots__/cli.spec.ts.snap b/test/__snapshots__/cli.spec.ts.snap index 1e3113be..99ab2056 100644 --- a/test/__snapshots__/cli.spec.ts.snap +++ b/test/__snapshots__/cli.spec.ts.snap @@ -164,27 +164,31 @@ Options: \\"c5a.12xlarge\\", \\"c5a.16xlarge\\", \\"c5a.24xlarge\\", \\"c5d.large\\", \\"c5d.xlarge\\", \\"c5d.2xlarge\\", \\"c5d.4xlarge\\", \\"c5d.9xlarge\\", \\"c5d.12xlarge\\", \\"c5d.18xlarge\\", \\"c5d.24xlarge\\", \\"c5d.metal\\", \\"c5n.large\\", \\"c5n.xlarge\\", \\"c5n.2xlarge\\", - \\"c5n.4xlarge\\", \\"c5n.9xlarge\\", \\"c5n.18xlarge\\", \\"c5n.metal\\", \\"r3.large\\", - \\"r3.xlarge\\", \\"r3.2xlarge\\", \\"r3.4xlarge\\", \\"r3.8xlarge\\", \\"r4.large\\", - \\"r4.xlarge\\", \\"r4.2xlarge\\", \\"r4.4xlarge\\", \\"r4.8xlarge\\", \\"r4.16xlarge\\", - \\"r5.large\\", \\"r5.xlarge\\", \\"r5.2xlarge\\", \\"r5.4xlarge\\", \\"r5.8xlarge\\", - \\"r5.12xlarge\\", \\"r5.16xlarge\\", \\"r5.24xlarge\\", \\"r5.metal\\", \\"r5a.large\\", - \\"r5a.xlarge\\", \\"r5a.2xlarge\\", \\"r5a.4xlarge\\", \\"r5a.8xlarge\\", \\"r5a.12xlarge\\", - \\"r5a.16xlarge\\", \\"r5a.24xlarge\\", \\"r5ad.large\\", \\"r5ad.xlarge\\", \\"r5ad.2xlarge\\", - \\"r5ad.4xlarge\\", \\"r5ad.8xlarge\\", \\"r5ad.12xlarge\\", \\"r5ad.16xlarge\\", - \\"r5ad.24xlarge\\", \\"r5d.large\\", \\"r5d.xlarge\\", \\"r5d.2xlarge\\", \\"r5d.4xlarge\\", - \\"r5d.8xlarge\\", \\"r5d.12xlarge\\", \\"r5d.16xlarge\\", \\"r5d.24xlarge\\", \\"r5d.metal\\", - \\"r5dn.large\\", \\"r5dn.xlarge\\", \\"r5dn.2xlarge\\", \\"r5dn.4xlarge\\", \\"r5dn.8xlarge\\", + \\"c5n.4xlarge\\", \\"c5n.9xlarge\\", \\"c5n.18xlarge\\", \\"c5n.metal\\", \\"c6g.medium\\", + \\"c6g.large\\", \\"c6g.xlarge\\", \\"c6g.2xlarge\\", \\"c6g.4xlarge\\", \\"c6g.8xlarge\\", + \\"c6g.12xlarge\\", \\"c6g.16xlarge\\", \\"c6g.metal\\", \\"r3.large\\", \\"r3.xlarge\\", + \\"r3.2xlarge\\", \\"r3.4xlarge\\", \\"r3.8xlarge\\", \\"r4.large\\", \\"r4.xlarge\\", + \\"r4.2xlarge\\", \\"r4.4xlarge\\", \\"r4.8xlarge\\", \\"r4.16xlarge\\", \\"r5.large\\", + \\"r5.xlarge\\", \\"r5.2xlarge\\", \\"r5.4xlarge\\", \\"r5.8xlarge\\", \\"r5.12xlarge\\", + \\"r5.16xlarge\\", \\"r5.24xlarge\\", \\"r5.metal\\", \\"r5a.large\\", \\"r5a.xlarge\\", + \\"r5a.2xlarge\\", \\"r5a.4xlarge\\", \\"r5a.8xlarge\\", \\"r5a.12xlarge\\", \\"r5a.16xlarge\\", + \\"r5a.24xlarge\\", \\"r5ad.large\\", \\"r5ad.xlarge\\", \\"r5ad.2xlarge\\", \\"r5ad.4xlarge\\", + \\"r5ad.8xlarge\\", \\"r5ad.12xlarge\\", \\"r5ad.16xlarge\\", \\"r5ad.24xlarge\\", + \\"r5d.large\\", \\"r5d.xlarge\\", \\"r5d.2xlarge\\", \\"r5d.4xlarge\\", \\"r5d.8xlarge\\", + \\"r5d.12xlarge\\", \\"r5d.16xlarge\\", \\"r5d.24xlarge\\", \\"r5d.metal\\", \\"r5dn.large\\", + \\"r5dn.xlarge\\", \\"r5dn.2xlarge\\", \\"r5dn.4xlarge\\", \\"r5dn.8xlarge\\", \\"r5dn.12xlarge\\", \\"r5dn.16xlarge\\", \\"r5dn.24xlarge\\", \\"r5n.large\\", \\"r5n.xlarge\\", \\"r5n.2xlarge\\", \\"r5n.4xlarge\\", \\"r5n.8xlarge\\", \\"r5n.12xlarge\\", \\"r5n.16xlarge\\", - \\"r5n.24xlarge\\", \\"x1.16xlarge\\", \\"x1.32xlarge\\", \\"x1e.xlarge\\", \\"x1e.2xlarge\\", - \\"x1e.4xlarge\\", \\"x1e.8xlarge\\", \\"x1e.16xlarge\\", \\"x1e.32xlarge\\", \\"z1d.large\\", - \\"z1d.xlarge\\", \\"z1d.2xlarge\\", \\"z1d.3xlarge\\", \\"z1d.6xlarge\\", \\"z1d.12xlarge\\", - \\"z1d.metal\\", \\"d2.xlarge\\", \\"d2.2xlarge\\", \\"d2.4xlarge\\", \\"d2.8xlarge\\", - \\"h1.2xlarge\\", \\"h1.4xlarge\\", \\"h1.8xlarge\\", \\"h1.16xlarge\\", \\"i2.xlarge\\", - \\"i2.2xlarge\\", \\"i2.4xlarge\\", \\"i2.8xlarge\\", \\"i3.large\\", \\"i3.xlarge\\", - \\"i3.2xlarge\\", \\"i3.4xlarge\\", \\"i3.8xlarge\\", \\"i3.16xlarge\\", \\"i3.metal\\", - \\"i3en.large\\", \\"i3en.xlarge\\", \\"i3en.2xlarge\\", \\"i3en.3xlarge\\", \\"i3en.6xlarge\\", + \\"r5n.24xlarge\\", \\"r6g.medium\\", \\"r6g.large\\", \\"r6g.xlarge\\", \\"r6g.2xlarge\\", + \\"r6g.4xlarge\\", \\"r6g.8xlarge\\", \\"r6g.12xlarge\\", \\"r6g.16xlarge\\", \\"r6g.metal\\", + \\"x1.16xlarge\\", \\"x1.32xlarge\\", \\"x1e.xlarge\\", \\"x1e.2xlarge\\", \\"x1e.4xlarge\\", + \\"x1e.8xlarge\\", \\"x1e.16xlarge\\", \\"x1e.32xlarge\\", \\"z1d.large\\", \\"z1d.xlarge\\", + \\"z1d.2xlarge\\", \\"z1d.3xlarge\\", \\"z1d.6xlarge\\", \\"z1d.12xlarge\\", \\"z1d.metal\\", + \\"d2.xlarge\\", \\"d2.2xlarge\\", \\"d2.4xlarge\\", \\"d2.8xlarge\\", \\"h1.2xlarge\\", + \\"h1.4xlarge\\", \\"h1.8xlarge\\", \\"h1.16xlarge\\", \\"i2.xlarge\\", \\"i2.2xlarge\\", + \\"i2.4xlarge\\", \\"i2.8xlarge\\", \\"i3.large\\", \\"i3.xlarge\\", \\"i3.2xlarge\\", + \\"i3.4xlarge\\", \\"i3.8xlarge\\", \\"i3.16xlarge\\", \\"i3.metal\\", \\"i3en.large\\", + \\"i3en.xlarge\\", \\"i3en.2xlarge\\", \\"i3en.3xlarge\\", \\"i3en.6xlarge\\", \\"i3en.12xlarge\\", \\"i3en.24xlarge\\", \\"i3en.metal\\", \\"inf1.xlarge\\", \\"inf1.2xlarge\\", \\"inf1.6xlarge\\", \\"inf1.24xlarge\\", \\"f1.2xlarge\\", \\"f1.4xlarge\\", \\"f1.16xlarge\\", \\"g2.2xlarge\\", \\"g2.8xlarge\\", \\"g3.4xlarge\\", \\"g3.8xlarge\\", \\"g3.16xlarge\\", @@ -197,9 +201,9 @@ Options: --familyType, -f EC2 instance family types. [array] [choices: \\"a1\\", \\"t1\\", \\"t2\\", \\"t3\\", \\"t3a\\", \\"m1\\", \\"m2\\", \\"m3\\", \\"m4\\", \\"m5\\", \\"m5a\\", \\"m5ad\\", \\"m5d\\", \\"m5dn\\", \\"m5n\\", \\"m6g\\", \\"c1\\", \\"c3\\", \\"c4\\", \\"c5\\", \\"c5a\\", - \\"c5d\\", \\"c5n\\", \\"r3\\", \\"r4\\", \\"r5\\", \\"r5a\\", \\"r5ad\\", \\"r5d\\", \\"r5dn\\", \\"r5n\\", \\"x1\\", - \\"x1e\\", \\"z1d\\", \\"d2\\", \\"h1\\", \\"i2\\", \\"i3\\", \\"i3en\\", \\"inf1\\", \\"f1\\", \\"g2\\", \\"g3\\", \\"g3s\\", - \\"g4dn\\", \\"p2\\", \\"p3\\", \\"p3dn\\"] + \\"c5d\\", \\"c5n\\", \\"c6g\\", \\"r3\\", \\"r4\\", \\"r5\\", \\"r5a\\", \\"r5ad\\", \\"r5d\\", \\"r5dn\\", \\"r5n\\", + \\"r6g\\", \\"x1\\", \\"x1e\\", \\"z1d\\", \\"d2\\", \\"h1\\", \\"i2\\", \\"i3\\", \\"i3en\\", \\"inf1\\", \\"f1\\", \\"g2\\", + \\"g3\\", \\"g3s\\", \\"g4dn\\", \\"p2\\", \\"p3\\", \\"p3dn\\"] --size, -s EC2 instance sizes. [array] [choices: \\"nano\\", \\"micro\\", \\"small\\", \\"medium\\", \\"large\\", \\"xlarge\\", \\"2xlarge\\", \\"3xlarge\\", \\"4xlarge\\", \\"6xlarge\\", \\"8xlarge\\", \\"9xlarge\\", \\"10xlarge\\", @@ -437,27 +441,31 @@ Options: \\"c5a.12xlarge\\", \\"c5a.16xlarge\\", \\"c5a.24xlarge\\", \\"c5d.large\\", \\"c5d.xlarge\\", \\"c5d.2xlarge\\", \\"c5d.4xlarge\\", \\"c5d.9xlarge\\", \\"c5d.12xlarge\\", \\"c5d.18xlarge\\", \\"c5d.24xlarge\\", \\"c5d.metal\\", \\"c5n.large\\", \\"c5n.xlarge\\", \\"c5n.2xlarge\\", - \\"c5n.4xlarge\\", \\"c5n.9xlarge\\", \\"c5n.18xlarge\\", \\"c5n.metal\\", \\"r3.large\\", - \\"r3.xlarge\\", \\"r3.2xlarge\\", \\"r3.4xlarge\\", \\"r3.8xlarge\\", \\"r4.large\\", - \\"r4.xlarge\\", \\"r4.2xlarge\\", \\"r4.4xlarge\\", \\"r4.8xlarge\\", \\"r4.16xlarge\\", - \\"r5.large\\", \\"r5.xlarge\\", \\"r5.2xlarge\\", \\"r5.4xlarge\\", \\"r5.8xlarge\\", - \\"r5.12xlarge\\", \\"r5.16xlarge\\", \\"r5.24xlarge\\", \\"r5.metal\\", \\"r5a.large\\", - \\"r5a.xlarge\\", \\"r5a.2xlarge\\", \\"r5a.4xlarge\\", \\"r5a.8xlarge\\", \\"r5a.12xlarge\\", - \\"r5a.16xlarge\\", \\"r5a.24xlarge\\", \\"r5ad.large\\", \\"r5ad.xlarge\\", \\"r5ad.2xlarge\\", - \\"r5ad.4xlarge\\", \\"r5ad.8xlarge\\", \\"r5ad.12xlarge\\", \\"r5ad.16xlarge\\", - \\"r5ad.24xlarge\\", \\"r5d.large\\", \\"r5d.xlarge\\", \\"r5d.2xlarge\\", \\"r5d.4xlarge\\", - \\"r5d.8xlarge\\", \\"r5d.12xlarge\\", \\"r5d.16xlarge\\", \\"r5d.24xlarge\\", \\"r5d.metal\\", - \\"r5dn.large\\", \\"r5dn.xlarge\\", \\"r5dn.2xlarge\\", \\"r5dn.4xlarge\\", \\"r5dn.8xlarge\\", + \\"c5n.4xlarge\\", \\"c5n.9xlarge\\", \\"c5n.18xlarge\\", \\"c5n.metal\\", \\"c6g.medium\\", + \\"c6g.large\\", \\"c6g.xlarge\\", \\"c6g.2xlarge\\", \\"c6g.4xlarge\\", \\"c6g.8xlarge\\", + \\"c6g.12xlarge\\", \\"c6g.16xlarge\\", \\"c6g.metal\\", \\"r3.large\\", \\"r3.xlarge\\", + \\"r3.2xlarge\\", \\"r3.4xlarge\\", \\"r3.8xlarge\\", \\"r4.large\\", \\"r4.xlarge\\", + \\"r4.2xlarge\\", \\"r4.4xlarge\\", \\"r4.8xlarge\\", \\"r4.16xlarge\\", \\"r5.large\\", + \\"r5.xlarge\\", \\"r5.2xlarge\\", \\"r5.4xlarge\\", \\"r5.8xlarge\\", \\"r5.12xlarge\\", + \\"r5.16xlarge\\", \\"r5.24xlarge\\", \\"r5.metal\\", \\"r5a.large\\", \\"r5a.xlarge\\", + \\"r5a.2xlarge\\", \\"r5a.4xlarge\\", \\"r5a.8xlarge\\", \\"r5a.12xlarge\\", \\"r5a.16xlarge\\", + \\"r5a.24xlarge\\", \\"r5ad.large\\", \\"r5ad.xlarge\\", \\"r5ad.2xlarge\\", \\"r5ad.4xlarge\\", + \\"r5ad.8xlarge\\", \\"r5ad.12xlarge\\", \\"r5ad.16xlarge\\", \\"r5ad.24xlarge\\", + \\"r5d.large\\", \\"r5d.xlarge\\", \\"r5d.2xlarge\\", \\"r5d.4xlarge\\", \\"r5d.8xlarge\\", + \\"r5d.12xlarge\\", \\"r5d.16xlarge\\", \\"r5d.24xlarge\\", \\"r5d.metal\\", \\"r5dn.large\\", + \\"r5dn.xlarge\\", \\"r5dn.2xlarge\\", \\"r5dn.4xlarge\\", \\"r5dn.8xlarge\\", \\"r5dn.12xlarge\\", \\"r5dn.16xlarge\\", \\"r5dn.24xlarge\\", \\"r5n.large\\", \\"r5n.xlarge\\", \\"r5n.2xlarge\\", \\"r5n.4xlarge\\", \\"r5n.8xlarge\\", \\"r5n.12xlarge\\", \\"r5n.16xlarge\\", - \\"r5n.24xlarge\\", \\"x1.16xlarge\\", \\"x1.32xlarge\\", \\"x1e.xlarge\\", \\"x1e.2xlarge\\", - \\"x1e.4xlarge\\", \\"x1e.8xlarge\\", \\"x1e.16xlarge\\", \\"x1e.32xlarge\\", \\"z1d.large\\", - \\"z1d.xlarge\\", \\"z1d.2xlarge\\", \\"z1d.3xlarge\\", \\"z1d.6xlarge\\", \\"z1d.12xlarge\\", - \\"z1d.metal\\", \\"d2.xlarge\\", \\"d2.2xlarge\\", \\"d2.4xlarge\\", \\"d2.8xlarge\\", - \\"h1.2xlarge\\", \\"h1.4xlarge\\", \\"h1.8xlarge\\", \\"h1.16xlarge\\", \\"i2.xlarge\\", - \\"i2.2xlarge\\", \\"i2.4xlarge\\", \\"i2.8xlarge\\", \\"i3.large\\", \\"i3.xlarge\\", - \\"i3.2xlarge\\", \\"i3.4xlarge\\", \\"i3.8xlarge\\", \\"i3.16xlarge\\", \\"i3.metal\\", - \\"i3en.large\\", \\"i3en.xlarge\\", \\"i3en.2xlarge\\", \\"i3en.3xlarge\\", \\"i3en.6xlarge\\", + \\"r5n.24xlarge\\", \\"r6g.medium\\", \\"r6g.large\\", \\"r6g.xlarge\\", \\"r6g.2xlarge\\", + \\"r6g.4xlarge\\", \\"r6g.8xlarge\\", \\"r6g.12xlarge\\", \\"r6g.16xlarge\\", \\"r6g.metal\\", + \\"x1.16xlarge\\", \\"x1.32xlarge\\", \\"x1e.xlarge\\", \\"x1e.2xlarge\\", \\"x1e.4xlarge\\", + \\"x1e.8xlarge\\", \\"x1e.16xlarge\\", \\"x1e.32xlarge\\", \\"z1d.large\\", \\"z1d.xlarge\\", + \\"z1d.2xlarge\\", \\"z1d.3xlarge\\", \\"z1d.6xlarge\\", \\"z1d.12xlarge\\", \\"z1d.metal\\", + \\"d2.xlarge\\", \\"d2.2xlarge\\", \\"d2.4xlarge\\", \\"d2.8xlarge\\", \\"h1.2xlarge\\", + \\"h1.4xlarge\\", \\"h1.8xlarge\\", \\"h1.16xlarge\\", \\"i2.xlarge\\", \\"i2.2xlarge\\", + \\"i2.4xlarge\\", \\"i2.8xlarge\\", \\"i3.large\\", \\"i3.xlarge\\", \\"i3.2xlarge\\", + \\"i3.4xlarge\\", \\"i3.8xlarge\\", \\"i3.16xlarge\\", \\"i3.metal\\", \\"i3en.large\\", + \\"i3en.xlarge\\", \\"i3en.2xlarge\\", \\"i3en.3xlarge\\", \\"i3en.6xlarge\\", \\"i3en.12xlarge\\", \\"i3en.24xlarge\\", \\"i3en.metal\\", \\"inf1.xlarge\\", \\"inf1.2xlarge\\", \\"inf1.6xlarge\\", \\"inf1.24xlarge\\", \\"f1.2xlarge\\", \\"f1.4xlarge\\", \\"f1.16xlarge\\", \\"g2.2xlarge\\", \\"g2.8xlarge\\", \\"g3.4xlarge\\", \\"g3.8xlarge\\", \\"g3.16xlarge\\", @@ -470,9 +478,9 @@ Options: --familyType, -f EC2 instance family types. [array] [choices: \\"a1\\", \\"t1\\", \\"t2\\", \\"t3\\", \\"t3a\\", \\"m1\\", \\"m2\\", \\"m3\\", \\"m4\\", \\"m5\\", \\"m5a\\", \\"m5ad\\", \\"m5d\\", \\"m5dn\\", \\"m5n\\", \\"m6g\\", \\"c1\\", \\"c3\\", \\"c4\\", \\"c5\\", \\"c5a\\", - \\"c5d\\", \\"c5n\\", \\"r3\\", \\"r4\\", \\"r5\\", \\"r5a\\", \\"r5ad\\", \\"r5d\\", \\"r5dn\\", \\"r5n\\", \\"x1\\", - \\"x1e\\", \\"z1d\\", \\"d2\\", \\"h1\\", \\"i2\\", \\"i3\\", \\"i3en\\", \\"inf1\\", \\"f1\\", \\"g2\\", \\"g3\\", \\"g3s\\", - \\"g4dn\\", \\"p2\\", \\"p3\\", \\"p3dn\\"] + \\"c5d\\", \\"c5n\\", \\"c6g\\", \\"r3\\", \\"r4\\", \\"r5\\", \\"r5a\\", \\"r5ad\\", \\"r5d\\", \\"r5dn\\", \\"r5n\\", + \\"r6g\\", \\"x1\\", \\"x1e\\", \\"z1d\\", \\"d2\\", \\"h1\\", \\"i2\\", \\"i3\\", \\"i3en\\", \\"inf1\\", \\"f1\\", \\"g2\\", + \\"g3\\", \\"g3s\\", \\"g4dn\\", \\"p2\\", \\"p3\\", \\"p3dn\\"] --size, -s EC2 instance sizes. [array] [choices: \\"nano\\", \\"micro\\", \\"small\\", \\"medium\\", \\"large\\", \\"xlarge\\", \\"2xlarge\\", \\"3xlarge\\", \\"4xlarge\\", \\"6xlarge\\", \\"8xlarge\\", \\"9xlarge\\", \\"10xlarge\\",