refactor sql code

miekki · Mar 1, 2024 · 3fa1a3e · 3fa1a3e
1 parent 9540013
commit 3fa1a3e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 23 deletions.
diff --git a/.github/workflows/module-keyvault copy.yml → .github/workflows/module-sqlserver.yml b/.github/workflows/module-keyvault copy.yml → .github/workflows/module-sqlserver.yml
diff --git a/modules/database/sql/main.bicep b/modules/database/sql/main.bicep
@@ -50,35 +50,59 @@ resource sqlServer 'Microsoft.Sql/servers@2023-05-01-preview' = {
     administratorLogin: sqlAdministratorUsername
     administratorLoginPassword: adminPassword
   }
-}
-
-resource vnetRule 'Microsoft.Sql/servers/virtualNetworkRules@2023-05-01-preview' = if (!empty(sqlServerSubnetId)) {
-  name: sqlServerName
-  properties: {
-    virtualNetworkSubnetId: sqlServerSubnetId
+  resource vnetRule 'virtualNetworkRules' = if (!empty(sqlServerSubnetId)) {
+    name: sqlServerName
+    properties: {
+      virtualNetworkSubnetId: sqlServerSubnetId
+    }
   }
-}
 
-resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-05-01-preview' = {
-  parent: sqlServer
-  name: sqlDatabaseName
-  location: location
-  sku: {
-    name: skuName
-    capacity: skuCapacity
-    tier: skuTier
+  resource sqlDatabase 'databases' = {
+    name: sqlDatabaseName
+    location: location
+    sku: {
+      name: skuName
+      capacity: skuCapacity
+      tier: skuTier
+    }
   }
-}
 
-resource firewall 'Microsoft.Sql/servers/firewallRules@2023-05-01-preview' = {
-  parent: sqlServer
-  name: 'AllowAllWindowsAzureIps'
-  properties: {
-    startIpAddress: '0.0.0.0'
-    endIpAddress: '0.0.0.0'
+  resource firewall 'firewallRules' = {
+    name: 'AllowAllWindowsAzureIps'
+    properties: {
+      startIpAddress: '0.0.0.0'
+      endIpAddress: '0.0.0.0'
+    }
   }
 }
 
+// resource vnetRule 'Microsoft.Sql/servers/virtualNetworkRules@2023-05-01-preview' = if (!empty(sqlServerSubnetId)) {
+//   name: sqlServerName
+//   properties: {
+//     virtualNetworkSubnetId: sqlServerSubnetId
+//   }
+// }
+
+// resource sqlDatabase 'Microsoft.Sql/servers/databases@2023-05-01-preview' = {
+//   parent: sqlServer
+//   name: sqlDatabaseName
+//   location: location
+//   sku: {
+//     name: skuName
+//     capacity: skuCapacity
+//     tier: skuTier
+//   }
+// }
+
+// resource firewall 'Microsoft.Sql/servers/firewallRules@2023-05-01-preview' = {
+//   parent: sqlServer
+//   name: 'AllowAllWindowsAzureIps'
+//   properties: {
+//     startIpAddress: '0.0.0.0'
+//     endIpAddress: '0.0.0.0'
+//   }
+// }
+
 resource keyVault 'Microsoft.KeyVault/vaults@2023-07-01' existing = {
   name: keyVaultName
 }
@@ -87,6 +111,6 @@ resource keyVaultSecret 'Microsoft.KeyVault/vaults/secrets@2023-07-01' = {
   parent: keyVault
   name: connectionStringKey
   properties: {
-    value: 'Server=${sqlServer.properties.fullyQualifiedDomainName}; Database=${sqlDatabase.name}; User=${sqlAdministratorUsername}; Password=${adminPassword};'
+    value: 'Server=${sqlServer.properties.fullyQualifiedDomainName}; Database=${sqlServer::sqlDatabase.name}; User=${sqlAdministratorUsername}; Password=${adminPassword};'
   }
 }