Skip to content

Commit 896f3de

Browse files
Prajwal-MicrosoftPrajwal-Microsoft
authored
Merge pull request #56 from microsoft/azd-version-issue-fix
fix: Code changes & document changes related to AZD issues with 1.17.0 version
2 parents 4d9dc7a + 0c6d307 commit 896f3de

4 files changed

Lines changed: 66 additions & 53 deletions

File tree

‎docs/github_code_spaces_steps.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ You can run this solution using GitHub Codespaces. The button will open a web-ba
4545

4646
10. Now start the deployment of the infrastructure by typing the command “azd up”
4747

48+
> ⚠️ **Note:** The latest version of the Azure Developer CLI (AZD) is currently limited on prompting for missing parameters. The feature flag parameters in this solution have been temporarily defaulted to `'disabled'` until this limitation is lifted and prompting will resume.
49+
4850
![image showing the terminal in vs code](../img/provisioning/azd_provision_terminal.png)
4951

5052
This step will allow you to choose from the subscriptions you have available, based on the account you logged in with in the login step. Next it will prompt you for the region to deploy the resources into as well as any additional Azure resources to be provisioned and configured.

‎docs/local_environment_steps.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,14 @@ azd env new '<app name>'
3030
```
3131

3232
Optionally set environment variables via the following commands:
33-
3433
```powershell
3534
azd env set 'AZURE_VM_ADMIN_PASSWORD' '<secure password>'
3635
```
3736

3837
# Deploy
3938

39+
> ⚠️ **Note:** The latest version of the Azure Developer CLI (AZD) is currently limited on prompting for missing parameters. The feature flag parameters in this solution have been temporarily defaulted to `'disabled'` until this limitation is lifted and prompting will resume.
40+
4041
To provision the necessary Azure resources and deploy the application, run the azd up command:
4142
```powershell
4243
azd up

‎infra/main.bicep‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ param connections connectionType[] = []
1515
param aiModelDeployments deploymentsType[] = []
1616

1717
@description('Specifies whether creating an Azure Container Registry.')
18-
param acrEnabled bool
18+
param acrEnabled bool = false
1919

2020
@description('Specifies the size of the jump-box Virtual Machine.')
2121
param vmSize string = 'Standard_DS4_v2'
@@ -41,7 +41,7 @@ param userObjectId string = deployer().objectId
4141
param allowedIpAddress string = ''
4242

4343
@description('Specifies if Microsoft APIM is deployed.')
44-
param apiManagementEnabled bool
44+
param apiManagementEnabled bool = false
4545

4646
@description('Specifies the publisher email for the API Management service. Defaults to admin@[name].com.')
4747
param apiManagementPublisherEmail string = 'admin@${name}.com'
@@ -50,37 +50,37 @@ param apiManagementPublisherEmail string = 'admin@${name}.com'
5050
param networkIsolation bool = true
5151

5252
@description('Whether to include Cosmos DB in the deployment.')
53-
param cosmosDbEnabled bool
53+
param cosmosDbEnabled bool = false
5454

5555
@description('Optional. List of Cosmos DB databases to deploy.')
5656
param cosmosDatabases sqlDatabaseType[] = []
5757

5858
@description('Whether to include SQL Server in the deployment.')
59-
param sqlServerEnabled bool
59+
param sqlServerEnabled bool = false
6060

6161
@description('Optional. List of SQL Server databases to deploy.')
6262
param sqlServerDatabases databasePropertyType[] = []
6363

6464
@description('Whether to include Azure AI Search in the deployment.')
65-
param searchEnabled bool
65+
param searchEnabled bool = false
6666

6767
@description('Whether to include Azure AI Content Safety in the deployment.')
68-
param contentSafetyEnabled bool
68+
param contentSafetyEnabled bool = false
6969

7070
@description('Whether to include Azure AI Vision in the deployment.')
71-
param visionEnabled bool
71+
param visionEnabled bool = false
7272

7373
@description('Whether to include Azure AI Language in the deployment.')
74-
param languageEnabled bool
74+
param languageEnabled bool = false
7575

7676
@description('Whether to include Azure AI Speech in the deployment.')
77-
param speechEnabled bool
77+
param speechEnabled bool = false
7878

7979
@description('Whether to include Azure AI Translator in the deployment.')
80-
param translatorEnabled bool
80+
param translatorEnabled bool = false
8181

8282
@description('Whether to include Azure Document Intelligence in the deployment.')
83-
param documentIntelligenceEnabled bool
83+
param documentIntelligenceEnabled bool = false
8484

8585
var defaultTags = {
8686
'azd-env-name': name

‎infra/main.json‎

Lines changed: 51 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.33.93.31351",
9-
"templateHash": "1285677619681818261"
8+
"version": "0.36.1.42791",
9+
"templateHash": "16413515920777914038"
1010
}
1111
},
1212
"definitions": {
@@ -1634,7 +1634,6 @@
16341634
},
16351635
"location": {
16361636
"type": "string",
1637-
"defaultValue": "[resourceGroup().location]",
16381637
"metadata": {
16391638
"description": "Specifies the location for all the Azure resources. Defaults to the location of the resource group."
16401639
}
@@ -1661,6 +1660,7 @@
16611660
},
16621661
"acrEnabled": {
16631662
"type": "bool",
1663+
"defaultValue": false,
16641664
"metadata": {
16651665
"description": "Specifies whether creating an Azure Container Registry."
16661666
}
@@ -1712,6 +1712,7 @@
17121712
},
17131713
"apiManagementEnabled": {
17141714
"type": "bool",
1715+
"defaultValue": false,
17151716
"metadata": {
17161717
"description": "Specifies if Microsoft APIM is deployed."
17171718
}
@@ -1732,6 +1733,7 @@
17321733
},
17331734
"cosmosDbEnabled": {
17341735
"type": "bool",
1736+
"defaultValue": false,
17351737
"metadata": {
17361738
"description": "Whether to include Cosmos DB in the deployment."
17371739
}
@@ -1748,6 +1750,7 @@
17481750
},
17491751
"sqlServerEnabled": {
17501752
"type": "bool",
1753+
"defaultValue": false,
17511754
"metadata": {
17521755
"description": "Whether to include SQL Server in the deployment."
17531756
}
@@ -1764,42 +1767,49 @@
17641767
},
17651768
"searchEnabled": {
17661769
"type": "bool",
1770+
"defaultValue": false,
17671771
"metadata": {
17681772
"description": "Whether to include Azure AI Search in the deployment."
17691773
}
17701774
},
17711775
"contentSafetyEnabled": {
17721776
"type": "bool",
1777+
"defaultValue": false,
17731778
"metadata": {
17741779
"description": "Whether to include Azure AI Content Safety in the deployment."
17751780
}
17761781
},
17771782
"visionEnabled": {
17781783
"type": "bool",
1784+
"defaultValue": false,
17791785
"metadata": {
17801786
"description": "Whether to include Azure AI Vision in the deployment."
17811787
}
17821788
},
17831789
"languageEnabled": {
17841790
"type": "bool",
1791+
"defaultValue": false,
17851792
"metadata": {
17861793
"description": "Whether to include Azure AI Language in the deployment."
17871794
}
17881795
},
17891796
"speechEnabled": {
17901797
"type": "bool",
1798+
"defaultValue": false,
17911799
"metadata": {
17921800
"description": "Whether to include Azure AI Speech in the deployment."
17931801
}
17941802
},
17951803
"translatorEnabled": {
17961804
"type": "bool",
1805+
"defaultValue": false,
17971806
"metadata": {
17981807
"description": "Whether to include Azure AI Translator in the deployment."
17991808
}
18001809
},
18011810
"documentIntelligenceEnabled": {
18021811
"type": "bool",
1812+
"defaultValue": false,
18031813
"metadata": {
18041814
"description": "Whether to include Azure Document Intelligence in the deployment."
18051815
}
@@ -5641,8 +5651,8 @@
56415651
"metadata": {
56425652
"_generator": {
56435653
"name": "bicep",
5644-
"version": "0.33.93.31351",
5645-
"templateHash": "10563293765969438544"
5654+
"version": "0.36.1.42791",
5655+
"templateHash": "14424734402412352330"
56465656
}
56475657
},
56485658
"parameters": {
@@ -6321,8 +6331,8 @@
63216331
"metadata": {
63226332
"_generator": {
63236333
"name": "bicep",
6324-
"version": "0.33.93.31351",
6325-
"templateHash": "9442281453257963936"
6334+
"version": "0.36.1.42791",
6335+
"templateHash": "11746621349310683559"
63266336
}
63276337
},
63286338
"parameters": {
@@ -12706,8 +12716,8 @@
1270612716
"metadata": {
1270712717
"_generator": {
1270812718
"name": "bicep",
12709-
"version": "0.33.93.31351",
12710-
"templateHash": "12630130910180117756"
12719+
"version": "0.36.1.42791",
12720+
"templateHash": "2158520837294746606"
1271112721
}
1271212722
},
1271312723
"parameters": {
@@ -18934,8 +18944,8 @@
1893418944
"metadata": {
1893518945
"_generator": {
1893618946
"name": "bicep",
18937-
"version": "0.33.93.31351",
18938-
"templateHash": "9749329569698294872"
18947+
"version": "0.36.1.42791",
18948+
"templateHash": "11482270866070363596"
1893918949
}
1894018950
},
1894118951
"definitions": {
@@ -30959,8 +30969,8 @@
3095930969
"metadata": {
3096030970
"_generator": {
3096130971
"name": "bicep",
30962-
"version": "0.33.93.31351",
30963-
"templateHash": "12389686054107465462"
30972+
"version": "0.36.1.42791",
30973+
"templateHash": "4400142003788830420"
3096430974
}
3096530975
},
3096630976
"definitions": {
@@ -38060,8 +38070,8 @@
3806038070
"metadata": {
3806138071
"_generator": {
3806238072
"name": "bicep",
38063-
"version": "0.33.93.31351",
38064-
"templateHash": "13783926077882220732"
38073+
"version": "0.36.1.42791",
38074+
"templateHash": "16919614201922288466"
3806538075
}
3806638076
},
3806738077
"definitions": {
@@ -40774,8 +40784,8 @@
4077440784
"metadata": {
4077540785
"_generator": {
4077640786
"name": "bicep",
40777-
"version": "0.33.93.31351",
40778-
"templateHash": "13783926077882220732"
40787+
"version": "0.36.1.42791",
40788+
"templateHash": "16919614201922288466"
4077940789
}
4078040790
},
4078140791
"definitions": {
@@ -43490,8 +43500,8 @@
4349043500
"metadata": {
4349143501
"_generator": {
4349243502
"name": "bicep",
43493-
"version": "0.33.93.31351",
43494-
"templateHash": "13783926077882220732"
43503+
"version": "0.36.1.42791",
43504+
"templateHash": "16919614201922288466"
4349543505
}
4349643506
},
4349743507
"definitions": {
@@ -46206,8 +46216,8 @@
4620646216
"metadata": {
4620746217
"_generator": {
4620846218
"name": "bicep",
46209-
"version": "0.33.93.31351",
46210-
"templateHash": "13783926077882220732"
46219+
"version": "0.36.1.42791",
46220+
"templateHash": "16919614201922288466"
4621146221
}
4621246222
},
4621346223
"definitions": {
@@ -48919,8 +48929,8 @@
4891948929
"metadata": {
4892048930
"_generator": {
4892148931
"name": "bicep",
48922-
"version": "0.33.93.31351",
48923-
"templateHash": "13783926077882220732"
48932+
"version": "0.36.1.42791",
48933+
"templateHash": "16919614201922288466"
4892448934
}
4892548935
},
4892648936
"definitions": {
@@ -51635,8 +51645,8 @@
5163551645
"metadata": {
5163651646
"_generator": {
5163751647
"name": "bicep",
51638-
"version": "0.33.93.31351",
51639-
"templateHash": "13783926077882220732"
51648+
"version": "0.36.1.42791",
51649+
"templateHash": "16919614201922288466"
5164051650
}
5164151651
},
5164251652
"definitions": {
@@ -54348,8 +54358,8 @@
5434854358
"metadata": {
5434954359
"_generator": {
5435054360
"name": "bicep",
54351-
"version": "0.33.93.31351",
54352-
"templateHash": "13783926077882220732"
54361+
"version": "0.36.1.42791",
54362+
"templateHash": "16919614201922288466"
5435354363
}
5435454364
},
5435554365
"definitions": {
@@ -57091,8 +57101,8 @@
5709157101
"metadata": {
5709257102
"_generator": {
5709357103
"name": "bicep",
57094-
"version": "0.33.93.31351",
57095-
"templateHash": "18300401960964991877"
57104+
"version": "0.36.1.42791",
57105+
"templateHash": "2345622020738803913"
5709657106
}
5709757107
},
5709857108
"definitions": {
@@ -62509,8 +62519,8 @@
6250962519
"metadata": {
6251062520
"_generator": {
6251162521
"name": "bicep",
62512-
"version": "0.33.93.31351",
62513-
"templateHash": "10286244752482293080"
62522+
"version": "0.36.1.42791",
62523+
"templateHash": "14156198524686936179"
6251462524
}
6251562525
},
6251662526
"parameters": {
@@ -63083,8 +63093,8 @@
6308363093
"metadata": {
6308463094
"_generator": {
6308563095
"name": "bicep",
63086-
"version": "0.33.93.31351",
63087-
"templateHash": "15582758383558794550"
63096+
"version": "0.36.1.42791",
63097+
"templateHash": "12408064070292908432"
6308863098
}
6308963099
},
6309063100
"definitions": {
@@ -74099,8 +74109,8 @@
7409974109
"metadata": {
7410074110
"_generator": {
7410174111
"name": "bicep",
74102-
"version": "0.33.93.31351",
74103-
"templateHash": "5435873910134176815"
74112+
"version": "0.36.1.42791",
74113+
"templateHash": "1542994590355543426"
7410474114
}
7410574115
},
7410674116
"definitions": {
@@ -78207,8 +78217,8 @@
7820778217
"metadata": {
7820878218
"_generator": {
7820978219
"name": "bicep",
78210-
"version": "0.33.93.31351",
78211-
"templateHash": "13278853949319290770"
78220+
"version": "0.36.1.42791",
78221+
"templateHash": "9207373860269569676"
7821278222
}
7821378223
},
7821478224
"parameters": {
@@ -86140,8 +86150,8 @@
8614086150
"metadata": {
8614186151
"_generator": {
8614286152
"name": "bicep",
86143-
"version": "0.33.93.31351",
86144-
"templateHash": "12134709961749323497"
86153+
"version": "0.36.1.42791",
86154+
"templateHash": "244112826431292448"
8614586155
}
8614686156
},
8614786157
"definitions": {
@@ -93339,8 +93349,8 @@
9333993349
"metadata": {
9334093350
"_generator": {
9334193351
"name": "bicep",
93342-
"version": "0.33.93.31351",
93343-
"templateHash": "5330058909966791926"
93352+
"version": "0.36.1.42791",
93353+
"templateHash": "18362011243916437863"
9334493354
}
9334593355
},
9334693356
"definitions": {

0 commit comments

Comments
 (0)