merge run_pipeline and templatize

Azure · Dec 20, 2024 · 0837ac7 · 0837ac7
1 parent e4de8fe
commit 0837ac7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 129 deletions.
diff --git a/Makefile b/Makefile
@@ -127,12 +127,12 @@ services_all = $(join services_svc,services_mgmt)
 services_svc_pipelines = frontend
 %.deploy:
 	$(eval export dirname=$(subst .,/,$(basename $@)))
-	./run_pipeline.sh $(DEPLOY_ENV) ./$(dirname)/pipeline.yaml deploy -c public
+	./templatize.sh $(DEPLOY_ENV) -p ./$(dirname)/pipeline.yaml -s deploy -P run -c public
 
 services_svc_pipelines = frontend
 %.dry_run:
 	$(eval export dirname=$(subst .,/,$(basename $@)))
-	./run_pipeline.sh $(DEPLOY_ENV) ./$(dirname)/pipeline.yaml deploy -c public -d
+	./templatize.sh $(DEPLOY_ENV) ./$(dirname)/pipeline.yaml -s deploy -P run -c public -d
 
 services_svc_all = $(join services_svc, services_svc_pipelines)
 

diff --git a/run_pipeline.sh b/run_pipeline.sh
diff --git a/templatize.sh b/templatize.sh
@@ -7,13 +7,16 @@ CLOUD="${CLOUD:-public}"
 REGION="${REGION:-westus3}"
 CXSTAMP="${CXSTAMP:-1}"
 EXTRA_ARGS=""
+PIPELINE_MODE="inspect"
+DRY_RUN=""
 
 # Function to display usage
 usage() {
     echo "Usage: $0 deploy_env input output [-c cloud] [-r region] [-x cxstamp] [-e]"
     echo "  deploy_env  Deployment environment"
     echo "  input       Optional input file"
     echo "  output      Optional output file"
+    echo "  -d          Dry run"
     echo "  -i          Set the input file same as second arg"
     echo "  -o          Set the output file same as third arg"
     echo "  -c          Set the cloud (default: public)"
@@ -45,11 +48,14 @@ if [ "$#" -ge 1 ] && [[ ! "$1" =~ ^- ]]; then
 fi
 
 # Parse optional flags
-while getopts "c:r:x:e:i:o:p:s:" opt; do
+while getopts "c:dr:x:e:i:o:p:P:s:" opt; do
     case ${opt} in
         c)
             CLOUD=${OPTARG}
             ;;
+        d)
+            DRY_RUN="--dry-run"
+            ;;
         r)
             REGION=${OPTARG}
             ;;
@@ -68,6 +74,9 @@ while getopts "c:r:x:e:i:o:p:s:" opt; do
         p)
             PIPELINE=${OPTARG}
             ;;
+        P)
+            PIPELINE_MODE=${OPTARG}
+            ;;
         s)
             PIPELINE_STEP=${OPTARG}
             ;;
@@ -127,7 +136,7 @@ if [ -n "$INPUT" ] && [ -n "$OUTPUT" ]; then
         --input=${INPUT} \
         --output=${OUTPUT} \
         ${EXTRA_ARGS}
-elif [ -n "$PIPELINE" ] && [ -n "$PIPELINE_STEP" ]; then
+elif [ $PIPELINE_MODE == "inspect" ] && [ -n "$PIPELINE" ] && [ -n "$PIPELINE_STEP" ]; then
     $TEMPLATIZE pipeline inspect \
         --config-file=${CONFIG_FILE} \
         --cloud=${CLOUD} \
@@ -139,6 +148,17 @@ elif [ -n "$PIPELINE" ] && [ -n "$PIPELINE_STEP" ]; then
         --step=${PIPELINE_STEP} \
         --scope vars \
         --format makefile
+elif [ $PIPELINE_MODE == "run" ] && [ -n "$PIPELINE" ] && [ -n "$PIPELINE_STEP" ]; then
+    $TEMPLATIZE pipeline run \
+        --config-file=${CONFIG_FILE} \
+        --cloud=${CLOUD} \
+        --deploy-env=${DEPLOY_ENV} \
+        --region=${REGION} \
+        --region-short=${REGION_STAMP} \
+        --stamp=${CXSTAMP} \
+        --pipeline-file=${PIPELINE} \
+        --step=${PIPELINE_STEP} \
+        ${DRY_RUN}
 else
     $TEMPLATIZE inspect \
         --config-file=${CONFIG_FILE} \