Skip to content

Commit

Permalink
Merge branch 'master' into huijbers/more-minimize
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Apr 5, 2022
2 parents 613ee1e + 5ce0ad3 commit 7e3e1e5
Show file tree
Hide file tree
Showing 104 changed files with 7,240 additions and 119 deletions.
14 changes: 7 additions & 7 deletions packages/@aws-cdk/aws-rds/test/integ.instance.lit.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"VPCPublicSubnet1SubnetB4246D30": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.0.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.0.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -116,11 +116,11 @@
"VPCPublicSubnet2Subnet74179F39": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.64.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.64.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -213,11 +213,11 @@
"VPCPrivateSubnet1Subnet8BCA10E0": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.128.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.128.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -275,11 +275,11 @@
"VPCPrivateSubnet2SubnetCFCDAA7A": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.192.0/18",
"VpcId": {
"Ref": "VPCB9E5F0B4"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.192.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -628,7 +628,7 @@
"Properties": {
"DBInstanceClass": "db.t3.medium",
"AllocatedStorage": "100",
"AutoMinorVersionUpgrade": false,
"AutoMinorVersionUpgrade": true,
"BackupRetentionPeriod": 7,
"CopyTagsToSnapshot": true,
"DBName": "ORCL",
Expand Down Expand Up @@ -696,8 +696,8 @@
}
]
},
"UpdateReplacePolicy": "Snapshot",
"DeletionPolicy": "Snapshot"
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"InstanceLogRetentiontrace487771C8": {
"Type": "Custom::LogRetention",
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-rds/test/integ.instance.lit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import * as targets from '@aws-cdk/aws-events-targets';
import * as lambda from '@aws-cdk/aws-lambda';
import * as logs from '@aws-cdk/aws-logs';
import * as cdk from '@aws-cdk/core';
import { RemovalPolicy } from '@aws-cdk/core';
import * as rds from '../lib';

const app = new cdk.App();
Expand Down Expand Up @@ -63,9 +64,10 @@ class DatabaseInstanceStack extends cdk.Stack {
'listener',
],
cloudwatchLogsRetention: logs.RetentionDays.ONE_MONTH,
autoMinorVersionUpgrade: false,
autoMinorVersionUpgrade: true, // required to be true if LOCATOR is used in the option group
optionGroup,
parameterGroup,
removalPolicy: RemovalPolicy.DESTROY,
});

// Allow connections on default port from any IPV4
Expand Down
14 changes: 7 additions & 7 deletions packages/@aws-cdk/aws-rds/test/integ.proxy.expected.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
"vpcPublicSubnet1Subnet2E65531E": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.0.0/18",
"VpcId": {
"Ref": "vpcA2121C38"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.0.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -115,11 +115,11 @@
"vpcPublicSubnet2Subnet009B674F": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.64.0/18",
"VpcId": {
"Ref": "vpcA2121C38"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.64.0/18",
"MapPublicIpOnLaunch": true,
"Tags": [
{
Expand Down Expand Up @@ -212,11 +212,11 @@
"vpcPrivateSubnet1Subnet934893E8": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.128.0/18",
"VpcId": {
"Ref": "vpcA2121C38"
},
"AvailabilityZone": "test-region-1a",
"CidrBlock": "10.0.128.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -274,11 +274,11 @@
"vpcPrivateSubnet2Subnet7031C2BA": {
"Type": "AWS::EC2::Subnet",
"Properties": {
"CidrBlock": "10.0.192.0/18",
"VpcId": {
"Ref": "vpcA2121C38"
},
"AvailabilityZone": "test-region-1b",
"CidrBlock": "10.0.192.0/18",
"MapPublicIpOnLaunch": false,
"Tags": [
{
Expand Down Expand Up @@ -462,7 +462,7 @@
"Ref": "dbInstanceSubnetGroupD062EC9E"
},
"Engine": "postgres",
"EngineVersion": "11.5",
"EngineVersion": "11.15",
"MasterUsername": {
"Fn::Join": [
"",
Expand Down Expand Up @@ -497,8 +497,8 @@
}
]
},
"UpdateReplacePolicy": "Snapshot",
"DeletionPolicy": "Snapshot"
"UpdateReplacePolicy": "Delete",
"DeletionPolicy": "Delete"
},
"dbProxyIAMRole662F3AB8": {
"Type": "AWS::IAM::Role",
Expand Down
4 changes: 3 additions & 1 deletion packages/@aws-cdk/aws-rds/test/integ.proxy.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as ec2 from '@aws-cdk/aws-ec2';
import * as cdk from '@aws-cdk/core';
import { RemovalPolicy } from '@aws-cdk/core';
import * as rds from '../lib';

const app = new cdk.App();
Expand All @@ -9,13 +10,14 @@ const vpc = new ec2.Vpc(stack, 'vpc', { maxAzs: 2 });

const dbInstance = new rds.DatabaseInstance(stack, 'dbInstance', {
engine: rds.DatabaseInstanceEngine.postgres({
version: rds.PostgresEngineVersion.VER_11_5,
version: rds.PostgresEngineVersion.VER_11_15,
}),
instanceType: ec2.InstanceType.of(ec2.InstanceClass.BURSTABLE3, ec2.InstanceSize.MEDIUM),
credentials: rds.Credentials.fromUsername('master', {
excludeCharacters: '"@/\\',
}),
vpc,
removalPolicy: RemovalPolicy.DESTROY,
});

new rds.DatabaseProxy(stack, 'dbProxy', {
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/cloud-assembly-schema/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './cloud-assembly';
export * from './assets';
export * from './manifest';
export * from './integ-tests';
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@
/**
* In what scenarios should the CLI ask for approval
*/
export enum RequireApproval {
/**
* Never ask for approval
*/
NEVER = 'never',

/**
* Prompt for approval for any type of change to the stack
*/
ANYCHANGE = 'any-change',

/**
* Only prompt for approval if there are security related changes
*/
BROADENING = 'broadening'
}

/**
* Default CDK CLI options that apply to all commands
*/
export interface DefaultCdkOptions {
/**
* List of stacks to deploy
*
* Requried if `all` is not set
*
* @default - []
*/
readonly stacks?: string[];

/**
* Deploy all stacks
*
* Requried if `stacks` is not set
*
* @default - false
*/
readonly all?: boolean;

/**
* command-line for executing your app or a cloud assembly directory
* e.g. "node bin/my-app.js"
* or
* "cdk.out"
*
* @default - read from cdk.json
*/
readonly app?: string;


/**
* Role to pass to CloudFormation for deployment
*
* @default - use the bootstrap cfn-exec role
*/
readonly roleArn?: string;

/**
* Additional context
*
* @default - no additional context
*/
readonly context?: { [name: string]: string };

/**
* Print trace for stack warnings
*
* @default false
*/
readonly trace?: boolean;

/**
* Do not construct stacks with warnings
*
* @default false
*/
readonly strict?: boolean;

/**
* Perform context lookups.
*
* Synthesis fails if this is disabled and context lookups need
* to be performed
*
* @default true
*/
readonly lookups?: boolean;

/**
* Ignores synthesis errors, which will likely produce an invalid output
*
* @default false
*/
readonly ignoreErrors?: boolean;

/**
* Use JSON output instead of YAML when templates are printed
* to STDOUT
*
* @default false
*/
readonly json?: boolean;

/**
* show debug logs
*
* @default false
*/
readonly verbose?: boolean;

/**
* enable emission of additional debugging information, such as creation stack
* traces of tokens
*
* @default false
*/
readonly debug?: boolean;

/**
* Use the indicated AWS profile as the default environment
*
* @default - no profile is used
*/
readonly profile?: string;

/**
* Use the indicated proxy. Will read from
* HTTPS_PROXY environment if specified
*
* @default - no proxy
*/
readonly proxy?: string;

/**
* Path to CA certificate to use when validating HTTPS
* requests.
*
* @default - read from AWS_CA_BUNDLE environment variable
*/
readonly caBundlePath?: string;

/**
* Force trying to fetch EC2 instance credentials
*
* @default - guess EC2 instance status
*/
readonly ec2Creds?: boolean;

/**
* Include "AWS::CDK::Metadata" resource in synthesized templates
*
* @default true
*/
readonly versionReporting?: boolean;

/**
* Include "aws:cdk:path" CloudFormation metadata for each resource
*
* @default true
*/
readonly pathMetadata?: boolean;

/**
* Include "aws:asset:*" CloudFormation metadata for resources that use assets
*
* @default true
*/
readonly assetMetadata?: boolean;

/**
* Copy assets to the output directory
*
* Needed for local debugging the source files with SAM CLI
*
* @default false
*/
readonly staging?: boolean;

/**
* Emits the synthesized cloud assembly into a directory
*
* @default cdk.out
*/
readonly output?: string;

/**
* Show relevant notices
*
* @default true
*/
readonly notices?: boolean;

/**
* Show colors and other style from console output
*
* @default true
*/
readonly color?: boolean;
}
Loading

0 comments on commit 7e3e1e5

Please sign in to comment.