Skip to content

Commit

Permalink
Update LICENSE and convert to markdown (aws#102)
Browse files Browse the repository at this point in the history
Add full license terms.

Misc: do not fail `./update-version.sh` if there is no commit head (this can happen when building a PR in CodeBuild immediately after git init).
  • Loading branch information
Elad Ben-Israel authored Jun 14, 2018
1 parent 5a0418a commit 77f6906
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 10 deletions.
7 changes: 0 additions & 7 deletions LICENSE

This file was deleted.

30 changes: 30 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
## AWS CDK BETA SERVICE ADDENDUM

These additional terms and conditions supplement the terms and conditions
contained in the AWS Customer Agreement between you and Amazon Web Services,
Inc. (the “Agreement”), and apply to your participation in the Beta Service
described below. Without limitation, Section 1.10 of the Service Terms describes
additional terms and conditions applicable to this Beta Service. IF YOU DO NOT
AGREE TO THE ADDITIONAL TERMS AND CONDITIONS IN THIS DOCUMENT, YOU MAY NOT USE
THE BETA SERVICE.

__Name of Beta Service__: AWS Cloud Development Kit (the “CDK”)

__Term of Beta Service__: From 06/18/2018 until general availability of the
CDK or as may be terminated early in accordance with the Agreement.

__Cost or Charges for use of the Beta Service__: There is no charge to use the
CDK. You are only charged for the AWS resources you deploy using the CDK. These
charges will vary based on your use. The latest pricing for AWS services can be
found at: https://aws.amazon.com/pricing/services

__Additional Terms and Conditions__:

* You may not use the CDK for any critical use case.
* Load testing, stress testing, benchmarking or similar use of the CDK is
prohibited.
* Any infrastructure code libraries or other content or materials that you
create with the CDK might not be migrated or supported in the generally
available versions of the CDK.
* The CDK is a Beta Material and may only be used as described in Section 1.10
of the Service Terms.
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
AWS Cloud Development Kit – Beta
Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
See LICENSE file for license terms.
See LICENSE.md file for license terms.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,5 @@ To vend another language for the CDK (given there's jsii support for it):
# License

Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
See [LICENSE](./LICENSE) file for license terms.

See [LICENSE](./LICENSE.md) file for license terms.
3 changes: 2 additions & 1 deletion update-version.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/bash
set -e

# HACK: lerna needs a git repo to work but publish will work nevertheless
git init
Expand All @@ -9,7 +10,7 @@ commit="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
# CODEBUILD_RESOLVED_SOURCE_VERSION is not defined (i.e. local build or CodePipeline build),
# use the HEAD commit hash
if [ -z "${commit}" ]; then
commit="$(git rev-parse --verify HEAD)"
commit="$(git rev-parse --verify HEAD || echo "head")"
fi

exec node_modules/.bin/lerna publish --skip-git --skip-npm --repo-version=${version}-beta+${commit:0:7} --yes

0 comments on commit 77f6906

Please sign in to comment.