Skip to content

Commit b633c16

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
authored
Merge pull request #94 from microsoft/psl-fix-pipeline-failures
ci: fixed pipeline failures
2 parents 1ae302c + bc14fcc commit b633c16

7 files changed

Lines changed: 366 additions & 46 deletions

File tree

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

Lines changed: 165 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,18 +76,174 @@ on:
7676
type: string
7777

7878
jobs:
79+
validate-inputs:
80+
runs-on: ubuntu-latest
81+
outputs:
82+
validation_passed: ${{ steps.validate.outputs.passed }}
83+
azure_location: ${{ steps.validate.outputs.azure_location }}
84+
resource_group_name: ${{ steps.validate.outputs.resource_group_name }}
85+
waf_enabled: ${{ steps.validate.outputs.waf_enabled }}
86+
exp: ${{ steps.validate.outputs.exp }}
87+
build_docker_image: ${{ steps.validate.outputs.build_docker_image }}
88+
cleanup_resources: ${{ steps.validate.outputs.cleanup_resources }}
89+
azure_env_log_analytics_workspace_id: ${{ steps.validate.outputs.azure_env_log_analytics_workspace_id }}
90+
azure_existing_ai_project_resource_id: ${{ steps.validate.outputs.azure_existing_ai_project_resource_id }}
91+
existing_webapp_url: ${{ steps.validate.outputs.existing_webapp_url }}
92+
steps:
93+
- name: Validate Workflow Input Parameters
94+
id: validate
95+
shell: bash
96+
env:
97+
INPUT_AZURE_LOCATION: ${{ github.event.inputs.azure_location }}
98+
INPUT_RESOURCE_GROUP_NAME: ${{ github.event.inputs.resource_group_name }}
99+
INPUT_WAF_ENABLED: ${{ github.event.inputs.waf_enabled }}
100+
INPUT_EXP: ${{ github.event.inputs.EXP }}
101+
INPUT_BUILD_DOCKER_IMAGE: ${{ github.event.inputs.build_docker_image }}
102+
INPUT_CLEANUP_RESOURCES: ${{ github.event.inputs.cleanup_resources }}
103+
INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID }}
104+
INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID }}
105+
INPUT_EXISTING_WEBAPP_URL: ${{ github.event.inputs.existing_webapp_url }}
106+
run: |
107+
echo "🔍 Validating workflow input parameters..."
108+
VALIDATION_FAILED=false
109+
110+
# Validate azure_location (Azure region format)
111+
LOCATION="${INPUT_AZURE_LOCATION:-australiaeast}"
112+
113+
if [[ ! "$LOCATION" =~ ^[a-z0-9]+$ ]]; then
114+
echo "❌ ERROR: azure_location '$LOCATION' is invalid. Must contain only lowercase letters and numbers"
115+
VALIDATION_FAILED=true
116+
else
117+
echo "✅ azure_location: '$LOCATION' is valid"
118+
fi
119+
120+
# Validate resource_group_name (Azure naming convention, optional)
121+
if [[ -n "$INPUT_RESOURCE_GROUP_NAME" ]]; then
122+
if [[ ! "$INPUT_RESOURCE_GROUP_NAME" =~ ^[a-zA-Z0-9._\(\)-]+$ ]] || [[ "$INPUT_RESOURCE_GROUP_NAME" =~ \.$ ]]; then
123+
echo "❌ ERROR: resource_group_name '$INPUT_RESOURCE_GROUP_NAME' is invalid. Must contain only alphanumerics, periods, underscores, hyphens, and parentheses. Cannot end with period."
124+
VALIDATION_FAILED=true
125+
elif [[ ${#INPUT_RESOURCE_GROUP_NAME} -gt 90 ]]; then
126+
echo "❌ ERROR: resource_group_name '$INPUT_RESOURCE_GROUP_NAME' exceeds 90 characters (length: ${#INPUT_RESOURCE_GROUP_NAME})"
127+
VALIDATION_FAILED=true
128+
else
129+
echo "✅ resource_group_name: '$INPUT_RESOURCE_GROUP_NAME' is valid"
130+
fi
131+
else
132+
echo "✅ resource_group_name: Not provided (will be auto-generated)"
133+
fi
134+
135+
# Validate waf_enabled (boolean)
136+
WAF_ENABLED="${INPUT_WAF_ENABLED:-false}"
137+
if [[ "$WAF_ENABLED" != "true" && "$WAF_ENABLED" != "false" ]]; then
138+
echo "❌ ERROR: waf_enabled must be 'true' or 'false', got: '$WAF_ENABLED'"
139+
VALIDATION_FAILED=true
140+
else
141+
echo "✅ waf_enabled: '$WAF_ENABLED' is valid"
142+
fi
143+
144+
# Validate EXP (boolean)
145+
EXP_ENABLED="${INPUT_EXP:-false}"
146+
if [[ "$EXP_ENABLED" != "true" && "$EXP_ENABLED" != "false" ]]; then
147+
echo "❌ ERROR: EXP must be 'true' or 'false', got: '$EXP_ENABLED'"
148+
VALIDATION_FAILED=true
149+
else
150+
echo "✅ EXP: '$EXP_ENABLED' is valid"
151+
fi
152+
153+
# Validate build_docker_image (boolean)
154+
BUILD_DOCKER="${INPUT_BUILD_DOCKER_IMAGE:-false}"
155+
if [[ "$BUILD_DOCKER" != "true" && "$BUILD_DOCKER" != "false" ]]; then
156+
echo "❌ ERROR: build_docker_image must be 'true' or 'false', got: '$BUILD_DOCKER'"
157+
VALIDATION_FAILED=true
158+
else
159+
echo "✅ build_docker_image: '$BUILD_DOCKER' is valid"
160+
fi
161+
162+
# Validate cleanup_resources (boolean)
163+
CLEANUP_RESOURCES="${INPUT_CLEANUP_RESOURCES:-false}"
164+
if [[ "$CLEANUP_RESOURCES" != "true" && "$CLEANUP_RESOURCES" != "false" ]]; then
165+
echo "❌ ERROR: cleanup_resources must be 'true' or 'false', got: '$CLEANUP_RESOURCES'"
166+
VALIDATION_FAILED=true
167+
else
168+
echo "✅ cleanup_resources: '$CLEANUP_RESOURCES' is valid"
169+
fi
170+
171+
# Validate AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID (optional, Azure Resource ID format)
172+
if [[ -n "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" ]]; then
173+
if [[ ! "$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/[Mm]icrosoft\.[Oo]perational[Ii]nsights/[Ww]orkspaces/[^/]+$ ]]; then
174+
echo "❌ ERROR: AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID is invalid. Must be a valid Azure Resource ID format:"
175+
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{workspaceName}"
176+
echo " Got: '$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID'"
177+
VALIDATION_FAILED=true
178+
else
179+
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Valid Resource ID format"
180+
fi
181+
else
182+
echo "✅ AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: Not provided (optional)"
183+
fi
184+
185+
# Validate AZURE_EXISTING_AI_PROJECT_RESOURCE_ID (optional, Azure Resource ID format)
186+
if [[ -n "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" ]]; then
187+
if [[ ! "$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" =~ ^/subscriptions/[a-fA-F0-9-]+/[Rr]esource[Gg]roups/[^/]+/providers/([Mm]icrosoft\.[Mm]achine[Ll]earning[Ss]ervices/([Ww]orkspaces|[Pp]rojects)/[^/]+|[Mm]icrosoft\.[Cc]ognitive[Ss]ervices/[Aa]ccounts/[^/]+/[Pp]rojects/[^/]+)$ ]]; then
188+
echo "❌ ERROR: AZURE_EXISTING_AI_PROJECT_RESOURCE_ID is invalid. Must be a valid Azure Resource ID format:"
189+
echo " /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.CognitiveServices/accounts/{accountName}/projects/{projectName}"
190+
echo " Got: '$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID'"
191+
VALIDATION_FAILED=true
192+
else
193+
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Valid Resource ID format"
194+
fi
195+
else
196+
echo "✅ AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: Not provided (optional)"
197+
fi
198+
199+
# Validate existing_webapp_url (optional, must start with https)
200+
if [[ -n "$INPUT_EXISTING_WEBAPP_URL" ]]; then
201+
if [[ ! "$INPUT_EXISTING_WEBAPP_URL" =~ ^https:// ]]; then
202+
echo "❌ ERROR: existing_webapp_url must start with 'https://', got: '$INPUT_EXISTING_WEBAPP_URL'"
203+
VALIDATION_FAILED=true
204+
else
205+
echo "✅ existing_webapp_url: '$INPUT_EXISTING_WEBAPP_URL' is valid"
206+
fi
207+
else
208+
echo "✅ existing_webapp_url: Not provided (will perform deployment)"
209+
fi
210+
211+
# Fail workflow if any validation failed
212+
if [[ "$VALIDATION_FAILED" == "true" ]]; then
213+
echo ""
214+
echo "❌ Parameter validation failed. Please correct the errors above and try again."
215+
exit 1
216+
fi
217+
218+
echo ""
219+
echo "✅ All input parameters validated successfully!"
220+
221+
# Output validated values
222+
echo "passed=true" >> $GITHUB_OUTPUT
223+
echo "azure_location=$LOCATION" >> $GITHUB_OUTPUT
224+
echo "resource_group_name=$INPUT_RESOURCE_GROUP_NAME" >> $GITHUB_OUTPUT
225+
echo "waf_enabled=$WAF_ENABLED" >> $GITHUB_OUTPUT
226+
echo "exp=$EXP_ENABLED" >> $GITHUB_OUTPUT
227+
echo "build_docker_image=$BUILD_DOCKER" >> $GITHUB_OUTPUT
228+
echo "cleanup_resources=$CLEANUP_RESOURCES" >> $GITHUB_OUTPUT
229+
echo "azure_env_log_analytics_workspace_id=$INPUT_AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID" >> $GITHUB_OUTPUT
230+
echo "azure_existing_ai_project_resource_id=$INPUT_AZURE_EXISTING_AI_PROJECT_RESOURCE_ID" >> $GITHUB_OUTPUT
231+
echo "existing_webapp_url=$INPUT_EXISTING_WEBAPP_URL" >> $GITHUB_OUTPUT
232+
79233
Run:
234+
needs: validate-inputs
235+
if: needs.validate-inputs.outputs.validation_passed == 'true'
80236
uses: ./.github/workflows/deploy-orchestrator.yml
81237
with:
82238
runner_os: ubuntu-latest
83-
azure_location: ${{ github.event.inputs.azure_location || 'australiaeast' }}
84-
resource_group_name: ${{ github.event.inputs.resource_group_name || '' }}
85-
waf_enabled: ${{ github.event.inputs.waf_enabled == 'true' }}
86-
EXP: ${{ github.event.inputs.EXP == 'true' }}
87-
build_docker_image: ${{ github.event.inputs.build_docker_image == 'true' }}
88-
cleanup_resources: ${{ github.event.inputs.cleanup_resources == 'true' }}
89-
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ github.event.inputs.AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID || '' }}
90-
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ github.event.inputs.AZURE_EXISTING_AI_PROJECT_RESOURCE_ID || '' }}
91-
existing_webapp_url: ${{ github.event.inputs.existing_webapp_url || '' }}
239+
azure_location: ${{ needs.validate-inputs.outputs.azure_location || 'australiaeast' }}
240+
resource_group_name: ${{ needs.validate-inputs.outputs.resource_group_name || '' }}
241+
waf_enabled: ${{ needs.validate-inputs.outputs.waf_enabled == 'true' }}
242+
EXP: ${{ needs.validate-inputs.outputs.exp == 'true' }}
243+
build_docker_image: ${{ needs.validate-inputs.outputs.build_docker_image == 'true' }}
244+
cleanup_resources: ${{ needs.validate-inputs.outputs.cleanup_resources == 'true' }}
245+
AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID: ${{ needs.validate-inputs.outputs.azure_env_log_analytics_workspace_id || '' }}
246+
AZURE_EXISTING_AI_PROJECT_RESOURCE_ID: ${{ needs.validate-inputs.outputs.azure_existing_ai_project_resource_id || '' }}
247+
existing_webapp_url: ${{ needs.validate-inputs.outputs.existing_webapp_url || '' }}
92248
trigger_type: ${{ github.event_name }}
93249
secrets: inherit

‎.github/workflows/deploy-orchestrator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
secrets: inherit
7474

7575
deploy:
76-
if: "!cancelled() && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)"
76+
if: "!cancelled() && (needs.docker-build.result == 'success' || needs.docker-build.result == 'skipped') && (inputs.trigger_type != 'workflow_dispatch' || inputs.existing_webapp_url == '' || inputs.existing_webapp_url == null)"
7777
needs: docker-build
7878
uses: ./.github/workflows/job-deploy.yml
7979
with:

0 commit comments

Comments
 (0)