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

chore: Update CloudFormation & SAM Resource Specs #594

Merged
merged 6 commits into from
Aug 17, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 72 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,78 @@
[@Mortifera]: https://github.com/Mortifera
[@maciejwalkowiak]: https://github.com/maciejwalkowiak

## [UNRELEASED]

* __@aws-cdk/cfnspec__: Updated [CloudFormation resource specification] to `v2.6.0` ([@RomainMuller] in [#594](https://github.com/awslabs/aws-cdk/pull/594))
+ **New AWS Construct Library**
- `@aws-cdk/aws-sagemaker` supports AWS::SageMaker resources
+ **New Resource Types**
- AWS::AmazonMQ::Broker
- AWS::AmazonMQ::Configuration
- AWS::CodePipeline::Webhook
- AWS::Config::AggregationAuthorization
- AWS::Config::ConfigurationAggregator
- AWS::EC2::VPCEndpointConnectionNotification
- AWS::EC2::VPCEndpointServicePermissions
- AWS::IAM::ServiceLinkedRole
- AWS::SSM::ResourceDataSync
- AWS::SageMaker::Endpoint
- AWS::SageMaker::EndpointConfig
- AWS::SageMaker::Model
- AWS::SageMaker::NotebookInstance
- AWS::SageMaker::NotebookInstanceLifecycleConfig
+ **Attribute Changes**
- AWS::CodePipeline::Pipeline Version (__added__)
+ **Property Changes**
- AWS::AppSync::DataSource HttpConfig (__added__)
- AWS::DAX::Cluster SSESpecification (__added__)
- AWS::EC2::VPCEndpoint IsPrivateDnsEnabled (__added__)
- AWS::EC2::VPCEndpoint SecurityGroupIds (__added__)
- AWS::EC2::VPCEndpoint SubnetIds (__added__)
- AWS::EC2::VPCEndpoint VPCEndpointType (__added__)
- AWS::EC2::VPCEndpoint RouteTableIds.DuplicatesAllowed (__deleted__)
- AWS::EC2::VPCPeeringConnection PeerRegion (__added__)
- AWS::EFS::FileSystem ProvisionedThroughputInMibps (__added__)
- AWS::EFS::FileSystem ThroughputMode (__added__)
- AWS::EMR::Cluster KerberosAttributes (__added__)
- AWS::Glue::Classifier JsonClassifier (__added__)
- AWS::Glue::Classifier XMLClassifier (__added__)
- AWS::Glue::Crawler Configuration (__added__)
- AWS::Neptune::DBInstance DBSubnetGroupName.UpdateType (__changed__)
- Old: Mutable
- New: Immutable
- AWS::SNS::Subscription DeliveryPolicy (__added__)
- AWS::SNS::Subscription FilterPolicy (__added__)
- AWS::SNS::Subscription RawMessageDelivery (__added__)
- AWS::SNS::Subscription Region (__added__)
- AWS::SQS::Queue Tags (__added__)
- AWS::ServiceDiscovery::Service HealthCheckCustomConfig (__added__)
+ **Property Type Changes**
- AWS::AppSync::DataSource.HttpConfig (__added__)
- AWS::DAX::Cluster.SSESpecification (__added__)
- AWS::EMR::Cluster.KerberosAttributes (__added__)
- AWS::Glue::Classifier.JsonClassifier (__added__)
- AWS::Glue::Classifier.XMLClassifier (__added__)
- AWS::ServiceDiscovery::Service.HealthCheckCustomConfig (__added__)
- AWS::CloudFront::Distribution.CacheBehavior FieldLevelEncryptionId (__added__)
- AWS::CloudFront::Distribution.DefaultCacheBehavior FieldLevelEncryptionId (__added__)
- AWS::CodeBuild::Project.Artifacts EncryptionDisabled (__added__)
- AWS::CodeBuild::Project.Artifacts OverrideArtifactName (__added__)
- AWS::CodeBuild::Project.Environment Certificate (__added__)
- AWS::CodeBuild::Project.Source ReportBuildStatus (__added__)
- AWS::ServiceDiscovery::Service.DnsConfig RoutingPolicy (__added__)
- AWS::WAF::WebACL.ActivatedRule Action.Required (__changed__)
- Old: true
- New: false

* __@aws-cdk/cfnspec__: Updated Serverless Application Model (SAM) Resource Specification ([@RomainMuller] in [#594](https://github.com/awslabs/aws-cdk/pull/594))
+ **Property Changes**
- AWS::Serverless::Api MethodSettings (__added__)
+ **Property Type Changes**
- AWS::Serverless::Function.SQSEvent (__added__)
- AWS::Serverless::Function.EventSource Properties.Types (__changed__)
- Added SQSEvent

## 0.8.2 - 2018-08-15

### Features
Expand Down
66 changes: 44 additions & 22 deletions create-missing-libraries.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,38 @@ for S in $(node -e 'console.log(require("./packages/@aws-cdk/cfnspec").namespace
mkdir -p packages/${P}/test
mkdir -p packages/${P}/lib
cat <<EOM > packages/${P}/.gitignore
*.js
*.js.map
*.d.ts
*.generated.ts
tsconfig.json
tslint.json
node_modules
dist
*.js
*.js.map
.jsii
.LAST_BUILD
.LAST_PACKAGE
.nycrc
.nyc_output
coverage
.LAST_BUILD
dist
tsconfig.json
tslint.json
EOM

cat <<EOM > packages/${P}/.npmignore
# Don't include original .ts files when doing \`npm pack\`
# The basics
*.ts
*.tgz
!*.d.ts
!*.js

# Coverage
coverage
.nyc_output
*.tgz
.nycrc

# Build gear
dist
.LAST_BUILD
.LAST_PACKAGE
.jsii
EOM

cat <<EOM > packages/${P}/package.json
Expand All @@ -58,28 +69,28 @@ EOM
"outdir": "dist",
"targets": {
"java": {
"package": "software.amazon.awscdk.services.${PB}",
"package": "software.amazon.awscdk.${PB/aws-/services.}",
"maven": {
"groupId": "software.amazon.awscdk",
"artifactId": "${PB}"
"artifactId": "${PB/aws-/}"
}
},
"dotnet": {
"namespace": "${S/AWS::/Amazon.CDK.AWS.}"
}
"sphinx": {}
}
},
"repository": {
"type": "git",
"url": "git://github.com/awslabs/aws-cdk"
"url": "https://github.com/awslabs/aws-cdk.git"
},
"homepage": "https://github.com/awslabs/aws-cdk",
"scripts": {
"build": "cdk-build",
"watch": "cdk-watch",
"integ": "cdk-integ",
"lint": "cdk-lint",
"package": "cdk-package",
"pkglint": "pkglint -f",
"test": "cdk-test",
"integ": "cdk-integ",
"pkglint": "pkglint -f"
"watch": "cdk-watch"
},
"cdk-build": {
"cloudformation": "${S}"
Expand All @@ -92,9 +103,10 @@ EOM
],
"author": {
"name": "Amazon Web Services",
"url": "https://aws.amazon.com"
"url": "https://aws.amazon.com",
"organization": true
},
"license": "LicenseRef-LICENSE",
"license": "Apache-2.0",
"devDependencies": {
"@aws-cdk/assert": "^${VERSION}",
"cdk-build-tools": "^${VERSION}",
Expand All @@ -109,10 +121,10 @@ EOM

cat <<EOM > packages/${P}/lib/index.ts
// ${S} CloudFormation Resources:
export * from './${PB}.generated';
export * from './${PB/aws-/}.generated';
EOM

cat <<EOM > packages/${P}/test/test.${PB}.ts
cat <<EOM > packages/${P}/test/test.${PB/aws-/}.ts
import { Test, testCase } from 'nodeunit';
import {} from '../lib';

Expand All @@ -124,6 +136,16 @@ exports = testCase({
});
EOM

cat <<EOM > packages/${P}/README.md
## ${S/::/ } Construct Library

\`\`\`ts
const ${PB/aws-/} = require('${P}');
\`\`\`
EOM

cp LICENSE NOTICE packages/${P}/

echo "⌛️ Bootstrapping & building ${P}"
lerna bootstrap --scope=${P}
lerna run build --scope=${P}
Expand Down
9 changes: 2 additions & 7 deletions packages/@aws-cdk/aws-codepipeline/lib/pipeline.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import iam = require('@aws-cdk/aws-iam');
import s3 = require('@aws-cdk/aws-s3');
import cdk = require('@aws-cdk/cdk');
import util = require('@aws-cdk/util');
import { cloudformation } from './codepipeline.generated';
import { cloudformation, PipelineVersion } from './codepipeline.generated';
import { Stage } from './stage';

/**
Expand All @@ -17,11 +17,6 @@ export class PipelineArn extends cdk.Arn { }
*/
export class PipelineName extends cdk.Token { }

/**
* The pipeline version.
*/
export class PipelineVersion extends cdk.Token { }

export interface PipelineProps {
/**
* The S3 bucket used by this Pipeline to store artifacts.
Expand Down Expand Up @@ -122,7 +117,7 @@ export class Pipeline extends cdk.Construct implements events.IEventRuleTarget {
this.artifactBucket.grantReadWrite(this.role);

this.pipelineName = codePipeline.ref;
this.pipelineVersion = codePipeline.getAtt('Version');
this.pipelineVersion = codePipeline.pipelineVersion;

// Does not expose a Fn::GetAtt for the ARN so we'll have to make it ourselves
this.pipelineArn = new PipelineArn(cdk.Arn.fromComponents({
Expand Down
13 changes: 13 additions & 0 deletions packages/@aws-cdk/aws-sagemaker/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
*.d.ts
*.generated.ts
*.js
*.js.map
.jsii
.LAST_BUILD
.LAST_PACKAGE
.nycrc
.nyc_output
coverage
dist
tsconfig.json
tslint.json
16 changes: 16 additions & 0 deletions packages/@aws-cdk/aws-sagemaker/.npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# The basics
*.ts
*.tgz
!*.d.ts
!*.js

# Coverage
coverage
.nyc_output
.nycrc

# Build gear
dist
.LAST_BUILD
.LAST_PACKAGE
.jsii
Loading