Skip to content

Commit 24aa53c

Browse files
authored
Force SqlDatabase resource api version (#9530)
1 parent c8b9a0c commit 24aa53c

13 files changed

+32
-28
lines changed

playground/SqlServerEndToEnd/SqlServerEndToEnd.AppHost/sql1.module.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql1
3636
}
3737

38-
resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource db1 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'db1'
4040
location: location
4141
properties: {

playground/SqlServerEndToEnd/SqlServerEndToEnd.AppHost/sql2.module.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql2
3636
}
3737

38-
resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource db2 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'db2'
4040
location: location
4141
properties: {

playground/SqlServerScript/AppHost1/mysqlserver.module.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: mysqlserver
3636
}
3737

38-
resource todosdb 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource todosdb 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'todosdb'
4040
location: location
4141
properties: {

playground/bicep/BicepSample.AppHost/sql.module.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql
3636
}
3737

38-
resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'db'
4040
location: location
4141
properties: {
@@ -52,4 +52,4 @@ output sqlServerFqdn string = sql.properties.fullyQualifiedDomainName
5252

5353
output name string = sql.name
5454

55-
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
55+
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name

playground/cdk/CdkSample.AppHost/sql.module.bicep

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql
3636
}
3737

38-
resource sqldb 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource sqldb 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'sqldb'
4040
location: location
4141
properties: {

src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,11 @@ private static void CreateSqlServer(
252252
private static SqlDatabase CreateAzureSQLDatabase(SqlServer sqlServer, string databaseKey, string databaseName)
253253
{
254254
var bicepIdentifier = Infrastructure.NormalizeBicepIdentifier(databaseKey);
255-
var sqlDatabase = new SqlDatabase(bicepIdentifier)
255+
256+
// Force the api version to the one supporting the free SKU
257+
// c.f. https://github.com/Azure/azure-sdk-for-net/issues/50281
258+
259+
var sqlDatabase = new SqlDatabase(bicepIdentifier, "2023-08-01")
256260
{
257261
Parent = sqlServer,
258262
Name = databaseName,

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AsAzureSqlDatabaseViaPublishMode.verified.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@description('The location for the resource(s) to be deployed.')
1+
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

44
resource sqlServerAdminManagedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql
3636
}
3737

38-
resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'dbName'
4040
location: location
4141
parent: sql

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureBicepResourceTests.AsAzureSqlDatabaseViaRunMode.verified.bicep

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@description('The location for the resource(s) to be deployed.')
1+
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

44
resource sqlServerAdminManagedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
@@ -44,7 +44,7 @@ resource sqlFirewallRule_AllowAllIps 'Microsoft.Sql/servers/firewallRules@2021-1
4444
parent: sql
4545
}
4646

47-
resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
47+
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
4848
name: 'dbName'
4949
location: location
5050
parent: sql
@@ -54,4 +54,4 @@ output sqlServerFqdn string = sql.properties.fullyQualifiedDomainName
5454

5555
output name string = sql.name
5656

57-
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
57+
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureContainerAppsTests.AddContainerAppEnvironmentWorksWithSqlServer.verified.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@description('The location for the resource(s) to be deployed.')
1+
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

44
resource sqlServerAdminManagedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql
3636
}
3737

38-
resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'db'
4040
location: location
4141
parent: sql

tests/Aspire.Hosting.Azure.Tests/Snapshots/AzureResourceOptionsTests.AzureResourceOptionsCanBeConfigured#01.verified.bicep

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@description('The location for the resource(s) to be deployed.')
1+
@description('The location for the resource(s) to be deployed.')
22
param location string = resourceGroup().location
33

44
resource sqlServerAdminManagedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = {
@@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
3535
parent: sql_server
3636
}
3737

38-
resource evadexdb 'Microsoft.Sql/servers/databases@2021-11-01' = {
38+
resource evadexdb 'Microsoft.Sql/servers/databases@2023-08-01' = {
3939
name: 'evadexdb'
4040
location: location
4141
parent: sql_server

0 commit comments

Comments
 (0)