Skip to content

Commit 22cce7a

Browse files
Dhruvkumar-MicrosoftDhruvkumar-Microsoft
committed
2 parents 173763f + 7ff85b1 commit 22cce7a

File tree

4 files changed

+37
-47
lines changed

4 files changed

+37
-47
lines changed

‎azure.yaml‎

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,28 +40,24 @@ hooks:
4040
Yellow='\033[1;33m'
4141
NC='\033[0m'
4242
43-
echo ""
44-
echo "${Yellow}==============================================================="
45-
echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
46-
echo "${Yellow}===============================================================${NC}"
47-
echo ""
43+
printf "\n"
44+
printf "${Yellow}===============================================================\n"
45+
printf "${Green} POST-DEPLOYMENT STEPS (Bash)\n"
46+
printf "${Yellow}===============================================================${NC}\n\n"
4847
49-
echo " STEP 1: Upload Team Configurations to Cosmos DB"
50-
echo " 👉 Run the following command in Bash:"
51-
echo " ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
52-
echo ""
48+
printf " STEP 1: Upload Team Configurations to Cosmos DB\n"
49+
printf " 👉 Run the following command in Bash:\n"
50+
printf " ${Blue}bash infra/scripts/upload_team_config.sh${NC}\n\n"
5351
54-
echo " STEP 2: Index Sample Data into Azure Search"
55-
echo " 👉 Run the following command in Bash:"
56-
echo " ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
57-
echo ""
52+
printf " STEP 2: Index Sample Data into Azure Search\n"
53+
printf " 👉 Run the following command in Bash:\n"
54+
printf " ${Blue}bash infra/scripts/process_sample_data.sh${NC}\n\n"
5855
59-
echo "💡 Alternatively, you can run above BOTH steps together using:"
60-
echo " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
61-
echo ""
56+
printf "💡 Alternatively, you can run above BOTH steps together using:\n"
57+
printf " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}\n\n"
6258
63-
echo "🌐 Access your deployed Frontend application at:"
64-
echo " ${Blue}https://$webSiteDefaultHostname${NC}"
65-
echo ""
59+
printf "🌐 Access your deployed Frontend application at:\n"
60+
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"
61+
6662
shell: sh
6763
interactive: true

‎azure_custom.yaml‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,23 @@ hooks:
7777
Yellow='\033[1;33m'
7878
NC='\033[0m'
7979
80-
echo ""
81-
echo "${Yellow}==============================================================="
82-
echo "${Green} POST-DEPLOYMENT STEPS (Bash) "
83-
echo "${Yellow}===============================================================${NC}"
84-
echo ""
80+
printf "\n"
81+
printf "${Yellow}===============================================================\n"
82+
printf "${Green} POST-DEPLOYMENT STEPS (Bash)\n"
83+
printf "${Yellow}===============================================================${NC}\n\n"
8584
86-
echo " STEP 1: Upload Team Configurations to Cosmos DB"
87-
echo " 👉 Run the following command in Bash:"
88-
echo " ${Blue}bash infra/scripts/upload_team_config.sh${NC}"
89-
echo ""
85+
printf " STEP 1: Upload Team Configurations to Cosmos DB\n"
86+
printf " 👉 Run the following command in Bash:\n"
87+
printf " ${Blue}bash infra/scripts/upload_team_config.sh${NC}\n\n"
9088
91-
echo " STEP 2: Index Sample Data into Azure Search"
92-
echo " 👉 Run the following command in Bash:"
93-
echo " ${Blue}bash infra/scripts/process_sample_data.sh${NC}"
94-
echo ""
89+
printf " STEP 2: Index Sample Data into Azure Search\n"
90+
printf " 👉 Run the following command in Bash:\n"
91+
printf " ${Blue}bash infra/scripts/process_sample_data.sh${NC}\n\n"
9592
96-
echo "💡 Alternatively, you can run above BOTH steps together using:"
97-
echo " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}"
98-
echo ""
93+
printf "💡 Alternatively, you can run above BOTH steps together using:\n"
94+
printf " ${Blue}bash infra/scripts/team_config_and_data.sh${NC}\n\n"
9995
100-
echo "🌐 Access your deployed Frontend application at:"
101-
echo " ${Blue}https://$webSiteDefaultHostname${NC}"
102-
echo ""
96+
printf "🌐 Access your deployed Frontend application at:\n"
97+
printf " ${Blue}https://%s${NC}\n\n" "$webSiteDefaultHostname"
10398
shell: sh
10499
interactive: true

‎infra/main.bicep‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ param enablePrivateNetworking bool = false
123123

124124
@secure()
125125
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
126-
param virtualMachineAdminUsername string = take(newGuid(), 20)
126+
param virtualMachineAdminUsername string?
127127

128128
@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
129129
@secure()
130-
param virtualMachineAdminPassword string = newGuid()
130+
param virtualMachineAdminPassword string?
131131

132132
// These parameters are changed for testing - please reset as part of publication
133133

@@ -608,8 +608,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
608608
computerName: take(virtualMachineResourceName, 15)
609609
osType: 'Windows'
610610
vmSize: virtualMachineSize
611-
adminUsername: virtualMachineAdminUsername
612-
adminPassword: virtualMachineAdminPassword
611+
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
612+
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
613613
patchMode: 'AutomaticByPlatform'
614614
bypassPlatformSafetyChecksOnUserSchedule: true
615615
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId

‎infra/main_custom.bicep‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,11 @@ param enablePrivateNetworking bool = false
124124

125125
@secure()
126126
@description('Optional. The user name for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
127-
param virtualMachineAdminUsername string = take(newGuid(), 20)
127+
param virtualMachineAdminUsername string?
128128

129129
@description('Optional. The password for the administrator account of the virtual machine. Allows to customize credentials if `enablePrivateNetworking` is set to true.')
130130
@secure()
131-
param virtualMachineAdminPassword string = newGuid()
132-
131+
param virtualMachineAdminPassword string?
133132
// These parameters are changed for testing - please reset as part of publication
134133

135134
@description('Optional. The Container Registry hostname where the docker images for the backend are located.')
@@ -923,8 +922,8 @@ module virtualMachine 'br/public:avm/res/compute/virtual-machine:0.17.0' = if (e
923922
computerName: take(virtualMachineResourceName, 15)
924923
osType: 'Windows'
925924
vmSize: virtualMachineSize
926-
adminUsername: virtualMachineAdminUsername
927-
adminPassword: virtualMachineAdminPassword
925+
adminUsername: virtualMachineAdminUsername ?? 'JumpboxAdminUser'
926+
adminPassword: virtualMachineAdminPassword ?? 'JumpboxAdminP@ssw0rd1234!'
928927
patchMode: 'AutomaticByPlatform'
929928
bypassPlatformSafetyChecksOnUserSchedule: true
930929
maintenanceConfigurationResourceId: maintenanceConfiguration!.outputs.resourceId

0 commit comments

Comments
 (0)