Merge branch 'master' into abrig-vg-create

microsoft · Apr 18, 2020 · 266cb84 · 266cb84
2 parents 5f30525 + 93ccc14
commit 266cb84
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/commands/infra/scaffold.ts b/src/commands/infra/scaffold.ts
@@ -232,6 +232,7 @@ export const generateClusterDefinition = (
   vartfData: string
 ): { [key: string]: string | { [key: string]: string } } => {
   const fields = parseVariablesTf(vartfData);
+  const defaultVariables: string[] = [];
   // map of string to string or map of string to string
   const def: { [key: string]: string | { [key: string]: string } } = {
     name: values.name,
@@ -252,9 +253,18 @@ export const generateClusterDefinition = (
     Object.keys(fieldDict).forEach((key) => {
       if (fieldDict[key] !== DEFAULT_VAR_VALUE) {
         delete fieldDict[key];
+        defaultVariables.push(key);
       }
     });
     def.variables = fieldDict;
+
+    if (defaultVariables.length > 0) {
+      logger.info(
+        `Default values will be used for these variables:\n${defaultVariables.join(
+          "\n"
+        )}. \nCustom values can be set for these variables in the definition.yaml file.`
+      );
+    }
   }
   return def;
 };

diff --git a/tests/functions.sh b/tests/functions.sh
@@ -537,8 +537,11 @@ function approve_pull_request () {
             exit 1
         fi
     fi
-    real_title=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[].title | startswith($pr_title)) | .[].title' | head -n 1)
+    real_title=$(echo $all_prs | jq -r --arg pr_title "$pr_title" '.[] | select(.title | startswith($pr_title)) | .title' | head -n 1)
     pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" 'select(.[0].title | startswith($pr_title)) | .[0].pullRequestId')
+    if [ "$pull_request_id" == "" ]; then
+        pull_request_id=$(echo $all_prs | jq -r --arg pr_title "$pr_title" '.[] | select(.title | startswith($pr_title)) | .pullRequestId' | head -n 1)
+    fi
     echo "Found pull request starting with phrase '$pr_title'"
     echo "Pull request id $pull_request_id is '$real_title'"
 

diff --git a/tests/validations.sh b/tests/validations.sh
@@ -393,6 +393,7 @@ git push -u origin --all
 
 # Wait for the lifecycle pipeline to finish and approve the pull request
 mono_repo_commit_id=$(git log --format="%H" -n 1)
+verify_pipeline_with_poll_and_source_version $AZDO_ORG_URL $AZDO_PROJECT $frontend_pipeline_name 500 15 $mono_repo_commit_id
 verify_pipeline_with_poll_and_source_version $AZDO_ORG_URL $AZDO_PROJECT $lifecycle_pipeline_name 300 15 $mono_repo_commit_id
 echo "Finding pull request that $lifecycle_pipeline_name pipeline created..."
 approve_pull_request $AZDO_ORG_URL $AZDO_PROJECT "Reconciling HLD"