Skip to content

Commit 1b1feb9

Browse files
Added fix for bug 31168
1 parent ad0e236 commit 1b1feb9

File tree

5 files changed

+9
-3
lines changed

5 files changed

+9
-3
lines changed

infra/main.bicep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
241241
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
242242
CreatedBy: createdBy
243243
DeploymentName: deployment().name
244+
SolutionSuffix: solutionSuffix
244245
}
245246
}
246247
}

infra/main_custom.bicep

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ resource resourceGroupTags 'Microsoft.Resources/tags@2021-04-01' = {
239239
Type: enablePrivateNetworking ? 'WAF' : 'Non-WAF'
240240
CreatedBy: createdBy
241241
DeploymentName: deployment().name
242+
SolutionSuffix: solutionSuffix
242243
}
243244
}
244245
}

infra/scripts/Selecting-Team-Config-And-Data.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,7 @@ if (-not $ResourceGroup) {
383383
exit 1
384384
}
385385
}
386+
}
386387

387388
# Interactive Use Case Selection
388389
Write-Host ""
@@ -865,7 +866,6 @@ if ($isTeamConfigFailed -or $isSampleDataFailed) {
865866
Write-Host "`nOne or more tasks failed. Please check the error messages above."
866867
exit 1
867868
} else {
868-
Write-Host "`nScript executed successfully. Sample Data Processed Successfully."
869869
if($useCaseSelection -eq "1"-or $useCaseSelection -eq "2" -or $useCaseSelection -eq "5" -or $useCaseSelection -eq "all" -or $useCaseSelection -eq "6"){
870870
Write-Host "`nTeam configuration upload and sample data processing completed successfully."
871871
}else {

infra/scripts/selecting_team_config_and_data.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -815,7 +815,6 @@ if [[ "$useCaseSelection" == "2" || "$useCaseSelection" == "all" || "$useCaseSel
815815
echo "Python script to index data for Retail Customer Satisfaction successfully executed."
816816
fi
817817

818-
echo "Script executed successfully. Sample Data Processed Successfully."
819818

820819
if [[ "$isTeamConfigFailed" == true || "$isSampleDataFailed" == true ]]; then
821820
echo ""

infra/scripts/upload_team_config.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,18 @@ def check_team_exists(backend_url, team_id, user_principal_id):
100100
uploaded_count += 1
101101
else:
102102
print(f"Upload failed for {filename}. Response: {resp_json}")
103+
sys.exit(1)
103104
except Exception as e:
104105
print(f"Error parsing response for {filename}: {str(e)}")
106+
sys.exit(1)
105107
else:
106108
print(f"Failed to upload {filename}. Status code: {response.status_code}, Response: {response.text}")
109+
sys.exit(1)
107110
except Exception as e:
108111
print(f"Error processing {filename}: {str(e)}")
112+
sys.exit(1)
109113
else:
110114
print(f"File not found: {filename}")
111-
115+
sys.exit(1)
116+
112117
print(f"Completed uploading team configurations")

0 commit comments

Comments
 (0)