Update version + publish release

microsoft · Feb 5, 2024 · 5a4aa4a · 5a4aa4a
1 parent e2ca33e
commit 5a4aa4a
Show file tree

Hide file tree

Showing 6 changed files with 2,235 additions and 43 deletions.
diff --git a/docs/_includes/version.txt b/docs/_includes/version.txt
@@ -1 +1 @@
-0.2.1-rc.2
+0.2.1-rc.3
diff --git a/docs/deploy/finops-hub-0.2.1-rc.3.json b/docs/deploy/finops-hub-0.2.1-rc.3.json
diff --git a/docs/deploy/finops-hub-latest.json b/docs/deploy/finops-hub-latest.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "6371350577264419703"
+      "templateHash": "9748975281421053488"
     }
   },
   "parameters": {
@@ -33,6 +33,13 @@
         "description": "Optional. Storage SKU to use. LRS = Lowest cost, ZRS = High availability. Note Standard SKUs are not available for Data Lake gen2 storage. Allowed: Premium_LRS, Premium_ZRS. Default: Premium_LRS."
       }
     },
+    "existingKeyVaultId": {
+      "type": "string",
+      "defaultValue": "",
+      "metadata": {
+        "description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
+      }
+    },
     "tags": {
       "type": "object",
       "defaultValue": {},
@@ -75,6 +82,9 @@
           "storageSku": {
             "value": "[parameters('storageSku')]"
           },
+          "existingKeyVaultId": {
+            "value": "[parameters('existingKeyVaultId')]"
+          },
           "tags": {
             "value": "[parameters('tags')]"
           },
@@ -92,7 +102,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.24.24.22086",
-              "templateHash": "2610829918662778812"
+              "templateHash": "17411969862525330364"
             }
           },
           "parameters": {
@@ -120,6 +130,13 @@
                 "description": "Optional. Storage SKU to use. LRS = Lowest cost, ZRS = High availability. Note Standard SKUs are not available for Data Lake gen2 storage. Allowed: Premium_LRS, Premium_ZRS. Default: Premium_LRS."
               }
             },
+            "existingKeyVaultId": {
+              "type": "string",
+              "defaultValue": "",
+              "metadata": {
+                "description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
+              }
+            },
             "tags": {
               "type": "object",
               "defaultValue": {},
@@ -487,8 +504,8 @@
                   "convertToParquet": {
                     "value": "[parameters('convertToParquet')]"
                   },
-                  "keyVaultName": {
-                    "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault'), '2022-09-01').outputs.name.value]"
+                  "keyVaultId": {
+                    "value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault'), '2022-09-01').outputs.resourceId.value]"
                   },
                   "storageAccountName": {
                     "value": "[reference(resourceId('Microsoft.Resources/deployments', 'storage'), '2022-09-01').outputs.name.value]"
@@ -516,20 +533,20 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.24.24.22086",
-                      "templateHash": "5738194981634133446"
+                      "templateHash": "8197671316834274442"
                     }
                   },
                   "parameters": {
                     "dataFactoryName": {
                       "type": "string",
                       "metadata": {
-                        "description": "Optional. Name of the hub. Used to ensure unique resource names. Default: \"finops-hub\"."
+                        "description": "Required. Name of the hub. Used to ensure unique resource names."
                       }
                     },
-                    "keyVaultName": {
+                    "keyVaultId": {
                       "type": "string",
                       "metadata": {
-                        "description": "Required. The name of the Azure Key Vault instance."
+                        "description": "Optional. The resource ID of the Azure Key Vault instance."
                       }
                     },
                     "storageAccountName": {
@@ -1123,7 +1140,7 @@
                         "parameters": {},
                         "type": "AzureKeyVault",
                         "typeProperties": {
-                          "baseUrl": "[reference(resourceId('Microsoft.KeyVault/vaults', parameters('keyVaultName')), '2022-11-01').vaultUri]"
+                          "baseUrl": "[reference(extensionResourceId(format('/subscriptions/{0}/resourceGroups/{1}', split(parameters('keyVaultId'), '/')[2], split(parameters('keyVaultId'), '/')[4]), 'Microsoft.KeyVault/vaults', last(split(parameters('keyVaultId'), '/'))), '2022-11-01').vaultUri]"
                         }
                       }
                     },
@@ -1794,6 +1811,9 @@
                   "hubName": {
                     "value": "[parameters('hubName')]"
                   },
+                  "existingKeyVaultName": {
+                    "value": "[last(split(parameters('existingKeyVaultId'), '/'))]"
+                  },
                   "uniqueSuffix": {
                     "value": "[variables('uniqueSuffix')]"
                   },
@@ -1830,7 +1850,7 @@
                     "_generator": {
                       "name": "bicep",
                       "version": "0.24.24.22086",
-                      "templateHash": "10770478197596540923"
+                      "templateHash": "18385434849803379988"
                     }
                   },
                   "parameters": {
@@ -1846,6 +1866,12 @@
                         "description": "Required. Suffix to add to the KeyVault instance name to ensure uniqueness."
                       }
                     },
+                    "existingKeyVaultName": {
+                      "type": "string",
+                      "metadata": {
+                        "description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
+                      }
+                    },
                     "location": {
                       "type": "string",
                       "defaultValue": "[resourceGroup().location]",
@@ -1911,31 +1937,32 @@
                   },
                   "resources": [
                     {
-                      "type": "Microsoft.KeyVault/vaults",
-                      "apiVersion": "2022-11-01",
-                      "name": "[variables('keyVaultName')]",
-                      "location": "[parameters('location')]",
-                      "tags": "[union(parameters('tags'), if(contains(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults'), parameters('tagsByResource')['Microsoft.KeyVault/vaults'], createObject()))]",
+                      "condition": "[and(not(empty(parameters('existingKeyVaultName'))), not(empty(parameters('accessPolicies'))))]",
+                      "type": "Microsoft.KeyVault/vaults/accessPolicies",
+                      "apiVersion": "2023-07-01",
+                      "name": "[format('{0}/{1}', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')), 'add')]",
                       "properties": {
-                        "enabledForDeployment": true,
-                        "enabledForTemplateDeployment": true,
-                        "enabledForDiskEncryption": true,
-                        "enableSoftDelete": true,
-                        "softDeleteRetentionInDays": 90,
-                        "enableRbacAuthorization": false,
-                        "createMode": "default",
-                        "tenantId": "[subscription().tenantId]",
-                        "accessPolicies": "[variables('formattedAccessPolicies')]",
-                        "sku": {
-                          "name": "[if(startsWith(parameters('location'), 'china'), 'standard', parameters('sku'))]",
-                          "family": "A"
-                        }
+                        "accessPolicies": "[variables('formattedAccessPolicies')]"
                       }
                     },
                     {
-                      "condition": "[not(empty(parameters('accessPolicies')))]",
+                      "condition": "[not(empty(parameters('existingKeyVaultName')))]",
+                      "type": "Microsoft.KeyVault/vaults/secrets",
+                      "apiVersion": "2023-07-01",
+                      "name": "[format('{0}/{1}', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')), parameters('storageAccountName'))]",
+                      "properties": {
+                        "attributes": {
+                          "enabled": true,
+                          "exp": 1702648632,
+                          "nbf": 10000
+                        },
+                        "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2022-09-01').keys[0].value]"
+                      }
+                    },
+                    {
+                      "condition": "[and(empty(parameters('existingKeyVaultName')), not(empty(parameters('accessPolicies'))))]",
                       "type": "Microsoft.KeyVault/vaults/accessPolicies",
-                      "apiVersion": "2022-11-01",
+                      "apiVersion": "2023-07-01",
                       "name": "[format('{0}/{1}', variables('keyVaultName'), 'add')]",
                       "properties": {
                         "accessPolicies": "[variables('formattedAccessPolicies')]"
@@ -1945,8 +1972,9 @@
                       ]
                     },
                     {
+                      "condition": "[empty(parameters('existingKeyVaultName'))]",
                       "type": "Microsoft.KeyVault/vaults/secrets",
-                      "apiVersion": "2022-11-01",
+                      "apiVersion": "2023-07-01",
                       "name": "[format('{0}/{1}', variables('keyVaultName'), parameters('storageAccountName'))]",
                       "properties": {
                         "attributes": {
@@ -1959,6 +1987,29 @@
                       "dependsOn": [
                         "[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"
                       ]
+                    },
+                    {
+                      "condition": "[empty(parameters('existingKeyVaultName'))]",
+                      "type": "Microsoft.KeyVault/vaults",
+                      "apiVersion": "2023-07-01",
+                      "name": "[variables('keyVaultName')]",
+                      "location": "[parameters('location')]",
+                      "tags": "[union(parameters('tags'), if(contains(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults'), parameters('tagsByResource')['Microsoft.KeyVault/vaults'], createObject()))]",
+                      "properties": {
+                        "enabledForDeployment": true,
+                        "enabledForTemplateDeployment": true,
+                        "enabledForDiskEncryption": true,
+                        "enableSoftDelete": true,
+                        "softDeleteRetentionInDays": 90,
+                        "enableRbacAuthorization": false,
+                        "createMode": "default",
+                        "tenantId": "[subscription().tenantId]",
+                        "accessPolicies": "[variables('formattedAccessPolicies')]",
+                        "sku": {
+                          "name": "[if(startsWith(parameters('location'), 'china'), 'standard', parameters('sku'))]",
+                          "family": "A"
+                        }
+                      }
                     }
                   ],
                   "outputs": {
@@ -1967,21 +2018,21 @@
                       "metadata": {
                         "description": "The resource ID of the key vault."
                       },
-                      "value": "[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"
+                      "value": "[if(empty(parameters('existingKeyVaultName')), resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName')), resourceId('Microsoft.KeyVault/vaults', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName'))))]"
                     },
                     "name": {
                       "type": "string",
                       "metadata": {
                         "description": "The name of the key vault."
                       },
-                      "value": "[variables('keyVaultName')]"
+                      "value": "[if(empty(parameters('existingKeyVaultName')), variables('keyVaultName'), if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')))]"
                     },
                     "uri": {
                       "type": "string",
                       "metadata": {
                         "description": "The URI of the key vault."
                       },
-                      "value": "[reference(resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName')), '2022-11-01').vaultUri]"
+                      "value": "[if(empty(parameters('existingKeyVaultName')), reference(resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName')), '2023-07-01').vaultUri, reference(resourceId('Microsoft.KeyVault/vaults', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName'))), '2023-07-01').vaultUri)]"
                     }
                   }
                 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ftk",
-  "version": "0.2.1-rc.2",
+  "version": "0.2.1-rc.3",
   "description": "Starter kits, scripts, and advanced solutions to accelerate your FinOps journey in the Microsoft Cloud.",
   "main": "index.js",
   "directories": {

diff --git a/src/scripts/Package-Toolkit.ps1 b/src/scripts/Package-Toolkit.ps1
@@ -57,12 +57,12 @@ if ($Template -ne "*" -and -not (Test-Path $relDir))
     return
 }
 
-Write-Host "Packaging v$version templates..."
-
 # Package templates
 $version = & "$PSScriptRoot/Get-Version"
 $isPrerelease = $version -like '*-*'
 
+Write-Host "Packaging v$version templates..."
+
 Write-Verbose "Removing existing ZIP files..."
 Remove-Item "$relDir/*.zip" -Force
 
@@ -93,9 +93,9 @@ $templates = Get-ChildItem $relDir -Directory `
     }
 
     # Copy azuredeploy.json to docs/deploy folder
-    if ($isPrerelease -and -not $Docs)
+    if ($Docs -or -not $isPrerelease)
     {
-        Write-Verbose "Updating $($path.Name) deployment file in docs..."
+        Write-Verbose "Updating $($path.Name) deployment files in docs..."
         Copy-Item "$path/azuredeploy.json" "$deployDir/$($path.Name)-$version.json"
         Copy-Item "$path/azuredeploy.json" "$deployDir/$($path.Name)-latest.json"
     }
@@ -105,7 +105,10 @@ $templates = Get-ChildItem $relDir -Directory `
     return $zip
 }
 Write-Host "✅ $($templates.Count) templates"
-Write-Host "ℹ️ Deployment files updated... Please commit the changes manually..."
+if ($Docs -or -not $isPrerelease)
+{
+    Write-Host "ℹ️ Deployment files updated... Please commit the changes manually..."
+}
 
 # Copy open data files
 Write-Verbose "Copying open data files..."