Unverified Commit 458b413b authored by John DiSanti's avatar John DiSanti Committed by GitHub
Browse files

Upgrade CDK infrastructure to CDK 2 (#1214) 

* Upgrade EKS integ test infrastructure to CDK 2

* Upgrade ci-cdk to CDK 2
parent 0a7d0521

aws/rust-runtime/aws-config/integration-tests/eks-credentials/bin/eks-credentials.ts

+3 −3
Original line number Diff line number Diff line 
#!/usr/bin/env node

/*

 * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.

 * SPDX-License-Identifier: Apache-2.0.

 */



#!/usr/bin/env node

import 'source-map-support/register';

import * as cdk from '@aws-cdk/core';

import { App } from "aws-cdk-lib";

import { EksCredentialsStack } from '../lib/eks-credentials-stack';



const app = new cdk.App();

const app = new App();

new EksCredentialsStack(app, 'EksCredentialsStack', {

  /* If you don't specify 'env', this stack will be environment-agnostic.

   * Account/Region-dependent features and context lookups will not work,

aws/rust-runtime/aws-config/integration-tests/eks-credentials/cdk.json

+0 −13
Original line number Diff line number Diff line 
{

  "app": "npx ts-node --prefer-ts-exts bin/eks-credentials.ts",

  "context": {

    "@aws-cdk/aws-apigateway:usagePlanKeyOrderInsensitiveId": true,

    "@aws-cdk/core:enableStackNameDuplicates": "true",

    "aws-cdk:enableDiffNoFail": "true",

    "@aws-cdk/core:stackRelativeExports": "true",

    "@aws-cdk/aws-ecr-assets:dockerIgnoreSupport": true,

    "@aws-cdk/aws-secretsmanager:parseOwnedSecretName": true,

    "@aws-cdk/aws-kms:defaultKeyPolicies": true,

    "@aws-cdk/aws-s3:grantWriteWithoutAcl": true,

    "@aws-cdk/aws-ecs-patterns:removeDefaultDesiredCount": true,

    "@aws-cdk/aws-rds:lowercaseDbIdentifier": true,

    "@aws-cdk/aws-efs:defaultEncryptionAtRest": true,

    "@aws-cdk/aws-lambda:recognizeVersionProps": true,

    "@aws-cdk/aws-cloudfront:defaultSecurityPolicyTLSv1.2_2021": true

  }

}

aws/rust-runtime/aws-config/integration-tests/eks-credentials/lib/eks-credentials-stack.ts

+7 −5
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ 
 * SPDX-License-Identifier: Apache-2.0.

 */



import * as cdk from '@aws-cdk/core';

import * as eks from '@aws-cdk/aws-eks';

import * as dynamodb from '@aws-cdk/aws-dynamodb';

export class EksCredentialsStack extends cdk.Stack {

  constructor(scope: cdk.Construct, id: string, props?: cdk.StackProps) {

import { Stack, StackProps } from "aws-cdk-lib";

import * as eks from "aws-cdk-lib/aws-eks";

import * as dynamodb from "aws-cdk-lib/aws-dynamodb";

import { Construct } from "constructs";



export class EksCredentialsStack extends Stack {

  constructor(scope: Construct, id: string, props?: StackProps) {

    super(scope, id, props);

aws/rust-runtime/aws-config/integration-tests/eks-credentials/package-lock.json

+1556 −16032

File changed.

Preview size limit exceeded, changes collapsed.

aws/rust-runtime/aws-config/integration-tests/eks-credentials/package.json

+6 −13
Original line number Diff line number Diff line 
{

  "name": "eks-credentials",

  "version": "0.1.0",

  "license": "Apache-2.0",

  "private": true,

  "bin": {

    "eks-credentials": "bin/eks-credentials.js"

  },

  "scripts": {

    "build": "tsc",

    "watch": "tsc -w",

    "test": "jest",

    "cdk": "cdk"

  },

  "devDependencies": {

    "@aws-cdk/assert": "1.143.0",

    "@types/jest": "^26.0.10",

    "@types/node": "10.17.27",

    "aws-cdk": "1.143.0",

    "jest": "^26.4.2",

    "ts-jest": "^26.2.0",

    "aws-cdk": "^2.0.0",

    "aws-cdk-lib": "^2.0.0",

    "constructs": "^10.0.0",

    "ts-node": "^9.0.0",

    "typescript": "~3.9.7"

  },

  "dependencies": {

    "@aws-cdk/aws-dynamodb": "^1.143.0",

    "@aws-cdk/aws-eks": "^1.143.0",

    "@aws-cdk/core": "1.143.0",

    "source-map-support": "^0.5.16"

    "typescript": "~4.5.5"

  }

}