From 9a6f14c0f55d6b31e316cdc2264a7681feab84f1 Mon Sep 17 00:00:00 2001
From: Niranjan Jayakar <16217941+nija-at@users.noreply.github.com>
Date: Fri, 10 Jan 2020 16:45:50 +0000
Subject: [PATCH] fix: broken build (#225)

The resource-overrides code build was broken because desiredCapacity is
not calculated all of the time.

Ref: https://github.com/aws/aws-cdk/commit/0adf6c75c1f0aa4acc131915970a496326dc559f#diff-ab28b1e5c6b252f017045680eb86f108

Also, outputting the current project being built into STDOUT for better
future diagnosis.
---
 .../amazon/awscdk/examples/testResourceOverrides.expected.json   | 1 -
 scripts/build-java.sh                                            | 1 +
 scripts/build-npm.sh                                             | 1 +
 scripts/build-python.sh                                          | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/resource-overrides/src/test/resources/software/amazon/awscdk/examples/testResourceOverrides.expected.json b/java/resource-overrides/src/test/resources/software/amazon/awscdk/examples/testResourceOverrides.expected.json
index 5d76d4f5c..f0a9a493d 100644
--- a/java/resource-overrides/src/test/resources/software/amazon/awscdk/examples/testResourceOverrides.expected.json
+++ b/java/resource-overrides/src/test/resources/software/amazon/awscdk/examples/testResourceOverrides.expected.json
@@ -373,7 +373,6 @@
       "Properties": {
         "MaxSize": "1",
         "MinSize": "1",
-        "DesiredCapacity": "1",
         "LaunchConfigurationName": {
           "Ref": "ASGLaunchConfigC00AF12B"
         },
diff --git a/scripts/build-java.sh b/scripts/build-java.sh
index 6a7eef5e9..4db4fff41 100755
--- a/scripts/build-java.sh
+++ b/scripts/build-java.sh
@@ -10,6 +10,7 @@ npm install
 for pomFile in $(find $scriptdir/../java -name pom.xml); do
     (
         cd $(dirname $pomFile)
+        echo "Building project at $(dirname $pomFile)"
         mvn compile test
 
         $scriptdir/synth.sh
diff --git a/scripts/build-npm.sh b/scripts/build-npm.sh
index 06809ec13..4c9b07fad 100755
--- a/scripts/build-npm.sh
+++ b/scripts/build-npm.sh
@@ -22,6 +22,7 @@ verify_star_dependencies() {
 # Find and build all NPM projects
 for pkgJson in $(find typescript -name package.json | grep -v node_modules); do
     (
+        echo "Building project at $(dirname $pkgJson)"
         cd $(dirname $pkgJson)
 
         if [[ -f DO_NOT_AUTOTEST ]]; then exit 0; fi
diff --git a/scripts/build-python.sh b/scripts/build-python.sh
index 5c89a2c0c..a0192dc56 100755
--- a/scripts/build-python.sh
+++ b/scripts/build-python.sh
@@ -16,6 +16,7 @@ for requirements in $(find $scriptdir/../python -name requirements.txt  -not -pa
         echo "=============================="
 
         cd $(dirname $requirements)
+        echo "Building project at $(dirname $requirements)"
         [[ ! -f DO_NOT_AUTOTEST ]] || exit 0
 
         source /tmp/.venv/bin/activate