From 705ddebf04dcfc1daf93404d53e5d89bda3e2ff8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier-Muller?= Date: Thu, 9 Aug 2018 09:57:04 +0200 Subject: [PATCH 1/2] Correct Java example in getting started Fixes #531 --- docs/src/getting-started.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/src/getting-started.rst b/docs/src/getting-started.rst index a531becf71ccb..bc5f8fb955539 100644 --- a/docs/src/getting-started.rst +++ b/docs/src/getting-started.rst @@ -795,7 +795,7 @@ Configure the bucket to use KMS managed encryption: new Bucket(this, "MyFirstBucket", BucketProps.builder() .withVersioned(true) - .withEncryption("MANAGED") + .withEncryption(BucketEncryption.KmsManaged) .build()); Compile the program: From 75cf4b741d6da762a1c4c6f36f7201a77dd2abf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=91=A8=F0=9F=8F=BC=E2=80=8D=F0=9F=92=BB=20Romain=20M?= =?UTF-8?q?arcadier-Muller?= Date: Thu, 9 Aug 2018 10:01:46 +0200 Subject: [PATCH 2/2] Fix version-setting in the documentation build. --- docs/build-docs.sh | 2 +- tools/pkgtools/bin/cdk-version | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/build-docs.sh b/docs/build-docs.sh index d411b6fd006ba..05307df0ee272 100755 --- a/docs/build-docs.sh +++ b/docs/build-docs.sh @@ -51,7 +51,7 @@ echo "Generating reference docs toctree under ${refs_index}..." cat ${refs_index}.template > ${refs_index} ls -1 ${refdocsdir} | grep '.rst$' | sed -e 's/\.rst//' | sort | xargs -I{} echo " ${refdocs}/{}" >> ${refs_index} -export CDK_VERSION=$(cdk-version || echo "0.0.0.0") +export CDK_VERSION=$(../tools/pkgtools/bin/cdk-version) echo "Set CDK_VERSION=${CDK_VERSION} (consumed by conf.py)..." sphinx-build -b html $staging $output diff --git a/tools/pkgtools/bin/cdk-version b/tools/pkgtools/bin/cdk-version index fd5d3921cb897..d86a2a26d9df5 100755 --- a/tools/pkgtools/bin/cdk-version +++ b/tools/pkgtools/bin/cdk-version @@ -1,2 +1,2 @@ -#!/bin/bash -cat ../../lerna.json | grep "version" | xargs | cut -d" " -f2 +#!/usr/bin/env node +console.log(require('../../../lerna.json').version);