Skip to content

Commit 5a4aa4a

Browse files
flanakinflanakin
committed
Update version + publish release
1 parent e2ca33e commit 5a4aa4a

File tree

6 files changed

+2235
-43
lines changed

6 files changed

+2235
-43
lines changed

Diff for: ‎docs/_includes/version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.2.1-rc.2
1+
0.2.1-rc.3

Diff for: ‎docs/deploy/finops-hub-0.2.1-rc.3.json

+2,138
Large diffs are not rendered by default.

Diff for: ‎docs/deploy/finops-hub-latest.json

+85-34
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"_generator": {
66
"name": "bicep",
77
"version": "0.24.24.22086",
8-
"templateHash": "6371350577264419703"
8+
"templateHash": "9748975281421053488"
99
}
1010
},
1111
"parameters": {
@@ -33,6 +33,13 @@
3333
"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."
3434
}
3535
},
36+
"existingKeyVaultId": {
37+
"type": "string",
38+
"defaultValue": "",
39+
"metadata": {
40+
"description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
41+
}
42+
},
3643
"tags": {
3744
"type": "object",
3845
"defaultValue": {},
@@ -75,6 +82,9 @@
7582
"storageSku": {
7683
"value": "[parameters('storageSku')]"
7784
},
85+
"existingKeyVaultId": {
86+
"value": "[parameters('existingKeyVaultId')]"
87+
},
7888
"tags": {
7989
"value": "[parameters('tags')]"
8090
},
@@ -92,7 +102,7 @@
92102
"_generator": {
93103
"name": "bicep",
94104
"version": "0.24.24.22086",
95-
"templateHash": "2610829918662778812"
105+
"templateHash": "17411969862525330364"
96106
}
97107
},
98108
"parameters": {
@@ -120,6 +130,13 @@
120130
"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."
121131
}
122132
},
133+
"existingKeyVaultId": {
134+
"type": "string",
135+
"defaultValue": "",
136+
"metadata": {
137+
"description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
138+
}
139+
},
123140
"tags": {
124141
"type": "object",
125142
"defaultValue": {},
@@ -487,8 +504,8 @@
487504
"convertToParquet": {
488505
"value": "[parameters('convertToParquet')]"
489506
},
490-
"keyVaultName": {
491-
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault'), '2022-09-01').outputs.name.value]"
507+
"keyVaultId": {
508+
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'keyVault'), '2022-09-01').outputs.resourceId.value]"
492509
},
493510
"storageAccountName": {
494511
"value": "[reference(resourceId('Microsoft.Resources/deployments', 'storage'), '2022-09-01').outputs.name.value]"
@@ -516,20 +533,20 @@
516533
"_generator": {
517534
"name": "bicep",
518535
"version": "0.24.24.22086",
519-
"templateHash": "5738194981634133446"
536+
"templateHash": "8197671316834274442"
520537
}
521538
},
522539
"parameters": {
523540
"dataFactoryName": {
524541
"type": "string",
525542
"metadata": {
526-
"description": "Optional. Name of the hub. Used to ensure unique resource names. Default: \"finops-hub\"."
543+
"description": "Required. Name of the hub. Used to ensure unique resource names."
527544
}
528545
},
529-
"keyVaultName": {
546+
"keyVaultId": {
530547
"type": "string",
531548
"metadata": {
532-
"description": "Required. The name of the Azure Key Vault instance."
549+
"description": "Optional. The resource ID of the Azure Key Vault instance."
533550
}
534551
},
535552
"storageAccountName": {
@@ -1123,7 +1140,7 @@
11231140
"parameters": {},
11241141
"type": "AzureKeyVault",
11251142
"typeProperties": {
1126-
"baseUrl": "[reference(resourceId('Microsoft.KeyVault/vaults', parameters('keyVaultName')), '2022-11-01').vaultUri]"
1143+
"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]"
11271144
}
11281145
}
11291146
},
@@ -1794,6 +1811,9 @@
17941811
"hubName": {
17951812
"value": "[parameters('hubName')]"
17961813
},
1814+
"existingKeyVaultName": {
1815+
"value": "[last(split(parameters('existingKeyVaultId'), '/'))]"
1816+
},
17971817
"uniqueSuffix": {
17981818
"value": "[variables('uniqueSuffix')]"
17991819
},
@@ -1830,7 +1850,7 @@
18301850
"_generator": {
18311851
"name": "bicep",
18321852
"version": "0.24.24.22086",
1833-
"templateHash": "10770478197596540923"
1853+
"templateHash": "18385434849803379988"
18341854
}
18351855
},
18361856
"parameters": {
@@ -1846,6 +1866,12 @@
18461866
"description": "Required. Suffix to add to the KeyVault instance name to ensure uniqueness."
18471867
}
18481868
},
1869+
"existingKeyVaultName": {
1870+
"type": "string",
1871+
"metadata": {
1872+
"description": "Optional. Resource ID of the existing Key Vault resource to use. If not specified, a new Key Vault instance will be created."
1873+
}
1874+
},
18491875
"location": {
18501876
"type": "string",
18511877
"defaultValue": "[resourceGroup().location]",
@@ -1911,31 +1937,32 @@
19111937
},
19121938
"resources": [
19131939
{
1914-
"type": "Microsoft.KeyVault/vaults",
1915-
"apiVersion": "2022-11-01",
1916-
"name": "[variables('keyVaultName')]",
1917-
"location": "[parameters('location')]",
1918-
"tags": "[union(parameters('tags'), if(contains(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults'), parameters('tagsByResource')['Microsoft.KeyVault/vaults'], createObject()))]",
1940+
"condition": "[and(not(empty(parameters('existingKeyVaultName'))), not(empty(parameters('accessPolicies'))))]",
1941+
"type": "Microsoft.KeyVault/vaults/accessPolicies",
1942+
"apiVersion": "2023-07-01",
1943+
"name": "[format('{0}/{1}', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')), 'add')]",
19191944
"properties": {
1920-
"enabledForDeployment": true,
1921-
"enabledForTemplateDeployment": true,
1922-
"enabledForDiskEncryption": true,
1923-
"enableSoftDelete": true,
1924-
"softDeleteRetentionInDays": 90,
1925-
"enableRbacAuthorization": false,
1926-
"createMode": "default",
1927-
"tenantId": "[subscription().tenantId]",
1928-
"accessPolicies": "[variables('formattedAccessPolicies')]",
1929-
"sku": {
1930-
"name": "[if(startsWith(parameters('location'), 'china'), 'standard', parameters('sku'))]",
1931-
"family": "A"
1932-
}
1945+
"accessPolicies": "[variables('formattedAccessPolicies')]"
19331946
}
19341947
},
19351948
{
1936-
"condition": "[not(empty(parameters('accessPolicies')))]",
1949+
"condition": "[not(empty(parameters('existingKeyVaultName')))]",
1950+
"type": "Microsoft.KeyVault/vaults/secrets",
1951+
"apiVersion": "2023-07-01",
1952+
"name": "[format('{0}/{1}', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')), parameters('storageAccountName'))]",
1953+
"properties": {
1954+
"attributes": {
1955+
"enabled": true,
1956+
"exp": 1702648632,
1957+
"nbf": 10000
1958+
},
1959+
"value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '2022-09-01').keys[0].value]"
1960+
}
1961+
},
1962+
{
1963+
"condition": "[and(empty(parameters('existingKeyVaultName')), not(empty(parameters('accessPolicies'))))]",
19371964
"type": "Microsoft.KeyVault/vaults/accessPolicies",
1938-
"apiVersion": "2022-11-01",
1965+
"apiVersion": "2023-07-01",
19391966
"name": "[format('{0}/{1}', variables('keyVaultName'), 'add')]",
19401967
"properties": {
19411968
"accessPolicies": "[variables('formattedAccessPolicies')]"
@@ -1945,8 +1972,9 @@
19451972
]
19461973
},
19471974
{
1975+
"condition": "[empty(parameters('existingKeyVaultName'))]",
19481976
"type": "Microsoft.KeyVault/vaults/secrets",
1949-
"apiVersion": "2022-11-01",
1977+
"apiVersion": "2023-07-01",
19501978
"name": "[format('{0}/{1}', variables('keyVaultName'), parameters('storageAccountName'))]",
19511979
"properties": {
19521980
"attributes": {
@@ -1959,6 +1987,29 @@
19591987
"dependsOn": [
19601988
"[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"
19611989
]
1990+
},
1991+
{
1992+
"condition": "[empty(parameters('existingKeyVaultName'))]",
1993+
"type": "Microsoft.KeyVault/vaults",
1994+
"apiVersion": "2023-07-01",
1995+
"name": "[variables('keyVaultName')]",
1996+
"location": "[parameters('location')]",
1997+
"tags": "[union(parameters('tags'), if(contains(parameters('tagsByResource'), 'Microsoft.KeyVault/vaults'), parameters('tagsByResource')['Microsoft.KeyVault/vaults'], createObject()))]",
1998+
"properties": {
1999+
"enabledForDeployment": true,
2000+
"enabledForTemplateDeployment": true,
2001+
"enabledForDiskEncryption": true,
2002+
"enableSoftDelete": true,
2003+
"softDeleteRetentionInDays": 90,
2004+
"enableRbacAuthorization": false,
2005+
"createMode": "default",
2006+
"tenantId": "[subscription().tenantId]",
2007+
"accessPolicies": "[variables('formattedAccessPolicies')]",
2008+
"sku": {
2009+
"name": "[if(startsWith(parameters('location'), 'china'), 'standard', parameters('sku'))]",
2010+
"family": "A"
2011+
}
2012+
}
19622013
}
19632014
],
19642015
"outputs": {
@@ -1967,21 +2018,21 @@
19672018
"metadata": {
19682019
"description": "The resource ID of the key vault."
19692020
},
1970-
"value": "[resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName'))]"
2021+
"value": "[if(empty(parameters('existingKeyVaultName')), resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName')), resourceId('Microsoft.KeyVault/vaults', if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName'))))]"
19712022
},
19722023
"name": {
19732024
"type": "string",
19742025
"metadata": {
19752026
"description": "The name of the key vault."
19762027
},
1977-
"value": "[variables('keyVaultName')]"
2028+
"value": "[if(empty(parameters('existingKeyVaultName')), variables('keyVaultName'), if(empty(parameters('existingKeyVaultName')), 'placeholder', parameters('existingKeyVaultName')))]"
19782029
},
19792030
"uri": {
19802031
"type": "string",
19812032
"metadata": {
19822033
"description": "The URI of the key vault."
19832034
},
1984-
"value": "[reference(resourceId('Microsoft.KeyVault/vaults', variables('keyVaultName')), '2022-11-01').vaultUri]"
2035+
"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)]"
19852036
}
19862037
}
19872038
}

Diff for: ‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ftk",
3-
"version": "0.2.1-rc.2",
3+
"version": "0.2.1-rc.3",
44
"description": "Starter kits, scripts, and advanced solutions to accelerate your FinOps journey in the Microsoft Cloud.",
55
"main": "index.js",
66
"directories": {

Diff for: ‎src/scripts/Package-Toolkit.ps1

+8-5
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ if ($Template -ne "*" -and -not (Test-Path $relDir))
5757
return
5858
}
5959

60-
Write-Host "Packaging v$version templates..."
61-
6260
# Package templates
6361
$version = & "$PSScriptRoot/Get-Version"
6462
$isPrerelease = $version -like '*-*'
6563

64+
Write-Host "Packaging v$version templates..."
65+
6666
Write-Verbose "Removing existing ZIP files..."
6767
Remove-Item "$relDir/*.zip" -Force
6868

@@ -93,9 +93,9 @@ $templates = Get-ChildItem $relDir -Directory `
9393
}
9494

9595
# Copy azuredeploy.json to docs/deploy folder
96-
if ($isPrerelease -and -not $Docs)
96+
if ($Docs -or -not $isPrerelease)
9797
{
98-
Write-Verbose "Updating $($path.Name) deployment file in docs..."
98+
Write-Verbose "Updating $($path.Name) deployment files in docs..."
9999
Copy-Item "$path/azuredeploy.json" "$deployDir/$($path.Name)-$version.json"
100100
Copy-Item "$path/azuredeploy.json" "$deployDir/$($path.Name)-latest.json"
101101
}
@@ -105,7 +105,10 @@ $templates = Get-ChildItem $relDir -Directory `
105105
return $zip
106106
}
107107
Write-Host "✅ $($templates.Count) templates"
108-
Write-Host "ℹ️ Deployment files updated... Please commit the changes manually..."
108+
if ($Docs -or -not $isPrerelease)
109+
{
110+
Write-Host "ℹ️ Deployment files updated... Please commit the changes manually..."
111+
}
109112

110113
# Copy open data files
111114
Write-Verbose "Copying open data files..."

0 commit comments

Comments
 (0)