Skip to content

Force SqlDatabase resource api version #9530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 27, 2025
Merged

Force SqlDatabase resource api version #9530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion playground/SqlServerEndToEnd/SqlServerEndToEnd.AppHost/sql1.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: sql1
}

resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db1 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db1'
location: location
properties: {
Expand Down
2 changes: 1 addition & 1 deletion playground/SqlServerEndToEnd/SqlServerEndToEnd.AppHost/sql2.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: sql2
}

resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db2 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db2'
location: location
properties: {
Expand Down
2 changes: 1 addition & 1 deletion playground/SqlServerScript/AppHost1/mysqlserver.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: mysqlserver
}

resource todosdb 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource todosdb 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'todosdb'
location: location
properties: {
Expand Down
4 changes: 2 additions & 2 deletions playground/bicep/BicepSample.AppHost/sql.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: sql
}

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

output name string = sql.name

output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
2 changes: 1 addition & 1 deletion playground/cdk/CdkSample.AppHost/sql.module.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: sql
}

resource sqldb 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource sqldb 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'sqldb'
location: location
properties: {
Expand Down
6 changes: 5 additions & 1 deletion src/Aspire.Hosting.Azure.Sql/AzureSqlExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,11 @@ private static void CreateSqlServer(
private static SqlDatabase CreateAzureSQLDatabase(SqlServer sqlServer, string databaseKey, string databaseName)
{
var bicepIdentifier = Infrastructure.NormalizeBicepIdentifier(databaseKey);
var sqlDatabase = new SqlDatabase(bicepIdentifier)

// Force the api version to the one supporting the free SKU
// c.f. https://github.com/Azure/azure-sdk-for-net/issues/50281

var sqlDatabase = new SqlDatabase(bicepIdentifier, "2023-08-01")
{
Parent = sqlServer,
Name = databaseName,
Expand Down
4 changes: 2 additions & 2 deletions ...e.Tests/Snapshots/AzureBicepResourceTests.AsAzureSqlDatabaseViaPublishMode.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

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

resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'dbName'
location: location
parent: sql
Expand Down
6 changes: 3 additions & 3 deletions ...Azure.Tests/Snapshots/AzureBicepResourceTests.AsAzureSqlDatabaseViaRunMode.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

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

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

output name string = sql.name

output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
4 changes: 2 additions & 2 deletions ...shots/AzureContainerAppsTests.AddContainerAppEnvironmentWorksWithSqlServer.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

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

resource db 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db'
location: location
parent: sql
Expand Down
4 changes: 2 additions & 2 deletions ...Snapshots/AzureResourceOptionsTests.AzureResourceOptionsCanBeConfigured#01.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

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

resource evadexdb 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource evadexdb 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'evadexdb'
location: location
parent: sql_server
Expand Down
8 changes: 4 additions & 4 deletions ...nsionsTests.AddAzureSqlServer_publishMode=False_useAcaInfrastructure=False.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource sqlFirewallRule_AllowAllIps 'Microsoft.Sql/servers/firewallRules@2021-1
parent: sql
}

resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db1 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db1'
location: location
properties: {
Expand All @@ -57,7 +57,7 @@ resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db2 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db2Name'
location: location
properties: {
Expand All @@ -70,7 +70,7 @@ resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db3 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db3 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db3Name'
location: location
parent: sql
Expand All @@ -80,4 +80,4 @@ output sqlServerFqdn string = sql.properties.fullyQualifiedDomainName

output name string = sql.name

output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
8 changes: 4 additions & 4 deletions ...ensionsTests.AddAzureSqlServer_publishMode=False_useAcaInfrastructure=True.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resource sqlFirewallRule_AllowAllIps 'Microsoft.Sql/servers/firewallRules@2021-1
parent: sql
}

resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db1 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db1'
location: location
properties: {
Expand All @@ -57,7 +57,7 @@ resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db2 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db2Name'
location: location
properties: {
Expand All @@ -70,7 +70,7 @@ resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db3 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db3 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db3Name'
location: location
parent: sql
Expand All @@ -80,4 +80,4 @@ output sqlServerFqdn string = sql.properties.fullyQualifiedDomainName

output name string = sql.name

output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
8 changes: 4 additions & 4 deletions ...ensionsTests.AddAzureSqlServer_publishMode=True_useAcaInfrastructure=False.verified.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ resource sqlFirewallRule_AllowAllAzureIps 'Microsoft.Sql/servers/firewallRules@2
parent: sql
}

resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db1 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db1'
location: location
properties: {
Expand All @@ -48,7 +48,7 @@ resource db1 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db2 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db2Name'
location: location
properties: {
Expand All @@ -61,7 +61,7 @@ resource db2 'Microsoft.Sql/servers/databases@2021-11-01' = {
parent: sql
}

resource db3 'Microsoft.Sql/servers/databases@2021-11-01' = {
resource db3 'Microsoft.Sql/servers/databases@2023-08-01' = {
name: 'db3Name'
location: location
parent: sql
Expand All @@ -71,4 +71,4 @@ output sqlServerFqdn string = sql.properties.fullyQualifiedDomainName

output name string = sql.name

output sqlServerAdminName string = sqlServerAdminManagedIdentity.name
output sqlServerAdminName string = sqlServerAdminManagedIdentity.name