Skip to content

Commit be5088a

Browse files
Vamshi-MicrosoftCopilot
andcommitted
Add enable_scalability input default false to deployment workflows for WAF configuration
Co-authored-by: Copilot <copilot@github.com>
1 parent 8345e19 commit be5088a

5 files changed

Lines changed: 44 additions & 0 deletions

File tree

.github/workflows/deploy-orchestrator.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ on:
2222
required: false
2323
default: false
2424
type: boolean
25+
enable_scalability:
26+
description: 'Enable Scalability (only applies when WAF is enabled)'
27+
required: false
28+
default: false
29+
type: boolean
2530
EXP:
2631
description: 'Enable EXP'
2732
required: false
@@ -83,6 +88,7 @@ jobs:
8388
azure_location: ${{ inputs.azure_location }}
8489
resource_group_name: ${{ inputs.resource_group_name }}
8590
waf_enabled: ${{ inputs.waf_enabled }}
91+
enable_scalability: ${{ inputs.enable_scalability }}
8692
EXP: ${{ inputs.EXP }}
8793
build_docker_image: ${{ inputs.build_docker_image }}
8894
existing_webapp_url: ${{ inputs.existing_webapp_url }}

.github/workflows/deploy-v2.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ on:
4646
required: false
4747
default: false
4848
type: boolean
49+
enable_scalability:
50+
description: 'Enable Scalability (only applies when WAF is enabled)'
51+
required: false
52+
default: false
53+
type: boolean
4954
EXP:
5055
description: 'Enable EXP'
5156
required: false
@@ -99,6 +104,7 @@ jobs:
99104
resource_group_name: ${{ steps.validate.outputs.resource_group_name }}
100105
waf_enabled: ${{ steps.validate.outputs.waf_enabled }}
101106
exp: ${{ steps.validate.outputs.exp }}
107+
enable_scalability: ${{ steps.validate.outputs.enable_scalability }}
102108
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
103109
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
104110
run_e2e_tests: ${{ steps.validate.outputs.run_e2e_tests }}
@@ -115,6 +121,7 @@ jobs:
115121
INPUT_RESOURCE_GROUP_NAME: ${{ github.event.inputs.resource_group_name }}
116122
INPUT_WAF_ENABLED: ${{ github.event.inputs.waf_enabled }}
117123
INPUT_EXP: ${{ github.event.inputs.EXP }}
124+
INPUT_ENABLE_SCALABILITY: ${{ github.event.inputs.enable_scalability }}
118125
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
119126
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
120127
INPUT_RUN_E2E_TESTS: ${{ github.event.inputs.run_e2e_tests }}
@@ -182,6 +189,8 @@ jobs:
182189
echo "✅ EXP: '$EXP_ENABLED' is valid"
183190
fi
184191
192+
ENABLE_SCALABILITY="${INPUT_ENABLE_SCALABILITY:-false}"
193+
185194
# Validate build_docker_image (boolean)
186195
BUILD_DOCKER="${INPUT_BUILD_DOCKER_IMAGE:-false}"
187196
if [[ "$BUILD_DOCKER" != "true" && "$BUILD_DOCKER" != "false" ]]; then
@@ -266,6 +275,7 @@ jobs:
266275
echo "resource_group_name=$INPUT_RESOURCE_GROUP_NAME" >> $GITHUB_OUTPUT
267276
echo "waf_enabled=$WAF_ENABLED" >> $GITHUB_OUTPUT
268277
echo "exp=$EXP_ENABLED" >> $GITHUB_OUTPUT
278+
echo "enable_scalability=$ENABLE_SCALABILITY" >> $GITHUB_OUTPUT
269279
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
270280
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
271281
echo "run_e2e_tests=$TEST_OPTION" >> $GITHUB_OUTPUT
@@ -283,6 +293,7 @@ jobs:
283293
resource_group_name: ${{ needs.validate-inputs.outputs.resource_group_name || '' }}
284294
waf_enabled: ${{ needs.validate-inputs.outputs.waf_enabled == 'true' }}
285295
EXP: ${{ needs.validate-inputs.outputs.exp == 'true' }}
296+
enable_scalability: ${{ needs.validate-inputs.outputs.enable_scalability == 'true' }}
286297
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
287298
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
288299
run_e2e_tests: ${{ needs.validate-inputs.outputs.run_e2e_tests || 'GoldenPath-Testing' }}

.github/workflows/job-deploy-linux.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
required: false
2929
type: string
3030
default: 'false'
31+
ENABLE_SCALABILITY:
32+
required: false
33+
type: string
34+
default: 'false'
3135
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
3236
required: false
3337
type: string
@@ -188,10 +192,16 @@ jobs:
188192
shell: bash
189193
env:
190194
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
195+
INPUT_ENABLE_SCALABILITY: ${{ inputs.ENABLE_SCALABILITY }}
191196
run: |
192197
if [[ "$INPUT_WAF_ENABLED" == "true" ]]; then
193198
cp infra/main.waf.parameters.json infra/main.parameters.json
194199
echo "✅ Successfully copied WAF parameters to main parameters file"
200+
SCALABILITY_VALUE="${INPUT_ENABLE_SCALABILITY:-false}"
201+
echo "🔧 Setting enableScalability=${SCALABILITY_VALUE} in main.parameters.json"
202+
tmpfile=$(mktemp)
203+
jq --argjson v "$SCALABILITY_VALUE" '.parameters.enableScalability.value = $v' infra/main.parameters.json > "$tmpfile" && mv "$tmpfile" infra/main.parameters.json
204+
echo "✅ enableScalability set to ${SCALABILITY_VALUE}"
195205
else
196206
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
197207
fi

.github/workflows/job-deploy-windows.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ on:
2828
required: false
2929
type: string
3030
default: 'false'
31+
ENABLE_SCALABILITY:
32+
required: false
33+
type: string
34+
default: 'false'
3135
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID:
3236
required: false
3337
type: string
@@ -188,10 +192,16 @@ jobs:
188192
shell: bash
189193
env:
190194
INPUT_WAF_ENABLED: ${{ inputs.WAF_ENABLED }}
195+
INPUT_ENABLE_SCALABILITY: ${{ inputs.ENABLE_SCALABILITY }}
191196
run: |
192197
if [[ "$INPUT_WAF_ENABLED" == "true" ]]; then
193198
cp infra/main.waf.parameters.json infra/main.parameters.json
194199
echo "✅ Successfully copied WAF parameters to main parameters file"
200+
SCALABILITY_VALUE="${INPUT_ENABLE_SCALABILITY:-false}"
201+
echo "🔧 Setting enableScalability=${SCALABILITY_VALUE} in main.parameters.json"
202+
tmpfile=$(mktemp)
203+
jq --argjson v "$SCALABILITY_VALUE" '.parameters.enableScalability.value = $v' infra/main.parameters.json > "$tmpfile" && mv "$tmpfile" infra/main.parameters.json
204+
echo "✅ enableScalability set to ${SCALABILITY_VALUE}"
195205
else
196206
echo "🔧 Configuring Non-WAF deployment - using default main.parameters.json..."
197207
fi

.github/workflows/job-deploy.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ on:
2626
required: false
2727
default: false
2828
type: boolean
29+
enable_scalability:
30+
description: 'Enable Scalability (only applies when WAF is enabled)'
31+
required: false
32+
default: false
33+
type: boolean
2934
EXP:
3035
description: 'Enable EXP'
3136
required: false
@@ -486,6 +491,7 @@ jobs:
486491
BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
487492
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
488493
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
494+
ENABLE_SCALABILITY: ${{ inputs.enable_scalability == true && 'true' || 'false' }}
489495
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
490496
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
491497
secrets: inherit
@@ -504,6 +510,7 @@ jobs:
504510
BUILD_DOCKER_IMAGE: ${{ inputs.build_docker_image || 'false' }}
505511
EXP: ${{ needs.azure-setup.outputs.EXP_ENABLED }}
506512
WAF_ENABLED: ${{ inputs.waf_enabled == true && 'true' || 'false' }}
513+
ENABLE_SCALABILITY: ${{ inputs.enable_scalability == true && 'true' || 'false' }}
507514
AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID: ${{ inputs.AZURE_ENV_EXISTING_LOG_ANALYTICS_WORKSPACE_RID }}
508515
AZURE_EXISTING_AIPROJECT_RESOURCE_ID: ${{ inputs.AZURE_EXISTING_AIPROJECT_RESOURCE_ID }}
509516
secrets: inherit

0 commit comments

Comments
 (0)