update keyvault for aspire use cases (#42086)

m-nash · web-flow · commit 6525004b01c9 · 2024-02-20T12:31:41.000-08:00
* update keyvault for aspire use cases

* update api
diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs
@@ -150,7 +150,7 @@ namespace Azure.Provisioning.KeyVaults
 {
     public partial class KeyVault : Azure.Provisioning.Resource<Azure.ResourceManager.KeyVault.KeyVaultData>
     {
-        public KeyVault(Azure.Provisioning.IConstruct scope, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?), Azure.Provisioning.ResourceManager.ResourceGroup? resourceGroup = null) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }
+        public KeyVault(Azure.Provisioning.IConstruct scope, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?)) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }
         public void AddAccessPolicy(Azure.Provisioning.Output output) { }
         protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }
     }
diff --git a/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs b/sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs
@@ -150,7 +150,7 @@ namespace Azure.Provisioning.KeyVaults
 {
     public partial class KeyVault : Azure.Provisioning.Resource<Azure.ResourceManager.KeyVault.KeyVaultData>
     {
-        public KeyVault(Azure.Provisioning.IConstruct scope, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?), Azure.Provisioning.ResourceManager.ResourceGroup? resourceGroup = null) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }
+        public KeyVault(Azure.Provisioning.IConstruct scope, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?)) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }
         public void AddAccessPolicy(Azure.Provisioning.Output output) { }
         protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }
     }
diff --git a/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVault.cs b/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVault.cs
@@ -24,9 +24,9 @@ public class KeyVault : Resource<KeyVaultData>
         /// <param name="name">The name.</param>
         /// <param name="version">The version.</param>
         /// <param name="location">The location.</param>
-        /// <param name="resourceGroup"></param>
-        public KeyVault(IConstruct scope, string name = "kv", string version = "2023-02-01", AzureLocation? location = default, ResourceGroup? resourceGroup = default)
-            : base(scope, resourceGroup, name, ResourceTypeName, version, (name) => ArmKeyVaultModelFactory.KeyVaultData(
+        /// <param name="parent"></param>
+        public KeyVault(IConstruct scope, ResourceGroup? parent = default, string name = "kv", string version = "2023-02-01", AzureLocation? location = default)
+            : base(scope, parent, name, ResourceTypeName, version, (name) => ArmKeyVaultModelFactory.KeyVaultData(
                 name: name,
                 resourceType: ResourceTypeName,
                 location: location ?? Environment.GetEnvironmentVariable("AZURE_LOCATION") ?? AzureLocation.WestUS,
@@ -43,8 +43,10 @@ public KeyVault(IConstruct scope, string name = "kv", string version = "2023-02-
                                 IdentityAccessSecretPermission.List
                             }
                         })
-                    } : default)))
+                    } : default,
+                    enableRbacAuthorization: true)))
         {
+            AddOutput(kv => kv.Properties.VaultUri, "vaultUri");
         }
 
         /// <summary>
diff --git a/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVaultAddAccessPolicy.cs b/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVaultAddAccessPolicy.cs
@@ -51,7 +51,7 @@ private static string GetParamValue(Parameter principalIdParameter, IConstruct s
             var result = base.FindParentInScope(scope);
             if (result is null)
             {
-                result = scope.GetSingleResource<KeyVault>() ?? new KeyVault(scope, "kv");
+                result = scope.GetSingleResource<KeyVault>() ?? new KeyVault(scope, name: "kv");
             }
             return result;
         }
diff --git a/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVaultExtensions.cs b/sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVaultExtensions.cs
@@ -20,7 +20,7 @@ public static class KeyVaultExtensions
         /// <returns></returns>
         public static KeyVault AddKeyVault(this IConstruct construct, ResourceGroup? resourceGroup = null, string name = "kv")
         {
-            return new KeyVault(construct, name, resourceGroup: resourceGroup);
+            return new KeyVault(construct, name: name, parent: resourceGroup);
         }
 
         /// <summary>
diff --git a/sdk/provisioning/Azure.Provisioning/tests/ConstructTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ConstructTests.cs
@@ -144,7 +144,7 @@ public void GetOutputsChildConstructs(bool recursive)
             rg2.AddOutput(r => r.Location, "location");
 
             // front end website has an output
-            var expected = recursive ? 3 : 1;
+            var expected = recursive ? 4 : 2;
             var outputs = infra.GetOutputs(recursive);
 
             Assert.AreEqual(expected, outputs.Count());
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep
@@ -49,4 +49,5 @@ module rg3_TEST './resources/rg3_TEST/rg3_TEST.bicep' = {
 
 output STORAGE_PRINCIPAL_ID string = rg1_TEST.outputs.STORAGE_PRINCIPAL_ID
 output LOCATION string = rg1_TEST.outputs.LOCATION
+output vaultUri string = rg1_TEST.outputs.vaultUri
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg3_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep
@@ -55,6 +55,7 @@ resource keyVault_BRsYQF4qT 'Microsoft.KeyVault/vaults@2023-02-01' = {
       name: 'standard'
       family: 'A'
     }
+    enableRbacAuthorization: true
   }
 }
 
@@ -79,3 +80,4 @@ resource keyVaultAddAccessPolicy_lQ2z7dHpX 'Microsoft.KeyVault/vaults/accessPoli
 
 output STORAGE_PRINCIPAL_ID string = webSite_dOTaZfna6.identity.principalId
 output LOCATION string = webSite_dOTaZfna6.location
+output vaultUri string = keyVault_BRsYQF4qT.properties.vaultUri
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/main.bicep
@@ -28,3 +28,4 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = {
 }
 
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
+output vaultUri string = rg_TEST.outputs.vaultUri
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep
@@ -84,6 +84,7 @@ resource keyVault_CRoMbemLF 'Microsoft.KeyVault/vaults@2023-02-01' = {
       name: 'standard'
       family: 'A'
     }
+    enableRbacAuthorization: true
   }
 }
 
@@ -246,3 +247,4 @@ resource applicationSettingsResource_vEe46o8Zn 'Microsoft.Web/sites/config@2021-
 }
 
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = webSite_W5EweSXEq.identity.principalId
+output vaultUri string = keyVault_CRoMbemLF.properties.vaultUri
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/main.bicep
@@ -28,3 +28,4 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = {
 }
 
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
+output vaultUri string = rg_TEST.outputs.vaultUri
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep
@@ -27,6 +27,7 @@ resource keyVault_CRoMbemLF 'Microsoft.KeyVault/vaults@2023-02-01' = {
       name: 'standard'
       family: 'A'
     }
+    enableRbacAuthorization: true
   }
 }
 
@@ -246,3 +247,4 @@ resource applicationSettingsResource_vEe46o8Zn 'Microsoft.Web/sites/config@2021-
 }
 
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = webSite_W5EweSXEq.identity.principalId
+output vaultUri string = keyVault_CRoMbemLF.properties.vaultUri
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/main.bicep
@@ -43,4 +43,5 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = {
   }
 }
 
+output vaultUri string = rg_TEST.outputs.vaultUri
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
diff --git a/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep b/sdk/provisioning/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep
@@ -30,6 +30,7 @@ resource keyVault_CRoMbemLF 'Microsoft.KeyVault/vaults@2023-02-01' = {
       name: 'standard'
       family: 'A'
     }
+    enableRbacAuthorization: true
   }
 }
 
@@ -133,4 +134,5 @@ resource webSiteConfigLogs_giqxapQs0 'Microsoft.Web/sites/config@2021-02-01' = {
   }
 }
 
+output vaultUri string = keyVault_CRoMbemLF.properties.vaultUri
 output SERVICE_API_IDENTITY_PRINCIPAL_ID string = webSite_W5EweSXEq.identity.principalId
diff --git a/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs b/sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs
@@ -170,7 +170,7 @@ public void OutputsSpanningModules()
             infra.Build(GetOutputPath());
 
             Assert.AreEqual(4, infra.GetParameters().Count());
-            Assert.AreEqual(3, infra.GetOutputs().Count());
+            Assert.AreEqual(4, infra.GetOutputs().Count());
 
             Assert.AreEqual(0, testFrontEndWebSite.GetParameters().Count());
             Assert.AreEqual(1, testFrontEndWebSite.GetOutputs().Count());

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ namespace Azure.Provisioning.KeyVaults`
`150`	`150`	`{`
`151`	`151`	`public partial class KeyVault : Azure.Provisioning.Resource<Azure.ResourceManager.KeyVault.KeyVaultData>`
`152`	`152`	`{`
`153`		`- public KeyVault(Azure.Provisioning.IConstruct scope, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?), Azure.Provisioning.ResourceManager.ResourceGroup? resourceGroup = null) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }`
	`153`	`+ public KeyVault(Azure.Provisioning.IConstruct scope, Azure.Provisioning.ResourceManager.ResourceGroup? parent = null, string name = "kv", string version = "2023-02-01", Azure.Core.AzureLocation? location = default(Azure.Core.AzureLocation?)) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(System.Func<string, Azure.ResourceManager.KeyVault.KeyVaultData>)) { }`
`154`	`154`	`public void AddAccessPolicy(Azure.Provisioning.Output output) { }`
`155`	`155`	`protected override Azure.Provisioning.Resource? FindParentInScope(Azure.Provisioning.IConstruct scope) { throw null; }`
`156`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ private static string GetParamValue(Parameter principalIdParameter, IConstruct s`
`51`	`51`	`var result = base.FindParentInScope(scope);`
`52`	`52`	`if (result is null)`
`53`	`53`	`{`
`54`		`- result = scope.GetSingleResource<KeyVault>() ?? new KeyVault(scope, "kv");`
	`54`	`+ result = scope.GetSingleResource<KeyVault>() ?? new KeyVault(scope, name: "kv");`
`55`	`55`	`}`
`56`	`56`	`return result;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public static class KeyVaultExtensions`
`20`	`20`	`/// <returns></returns>`
`21`	`21`	`public static KeyVault AddKeyVault(this IConstruct construct, ResourceGroup? resourceGroup = null, string name = "kv")`
`22`	`22`	`{`
`23`		`- return new KeyVault(construct, name, resourceGroup: resourceGroup);`
	`23`	`+ return new KeyVault(construct, name: name, parent: resourceGroup);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,7 @@ resource keyVault_BRsYQF4qT 'Microsoft.KeyVault/vaults@2023-02-01' = {`
`55`	`55`	`name: 'standard'`
`56`	`56`	`family: 'A'`
`57`	`57`	`}`
	`58`	`+ enableRbacAuthorization: true`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`
`@@ -79,3 +80,4 @@ resource keyVaultAddAccessPolicy_lQ2z7dHpX 'Microsoft.KeyVault/vaults/accessPoli`
`79`	`80`
`80`	`81`	`output STORAGE_PRINCIPAL_ID string = webSite_dOTaZfna6.identity.principalId`
`81`	`82`	`output LOCATION string = webSite_dOTaZfna6.location`
	`83`	`+output vaultUri string = keyVault_BRsYQF4qT.properties.vaultUri`
Original file line number	Diff line number	Diff line change
`@@ -28,3 +28,4 @@ module rg_TEST './resources/rg_TEST/rg_TEST.bicep' = {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`output SERVICE_API_IDENTITY_PRINCIPAL_ID string = rg_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID`
	`31`	`+output vaultUri string = rg_TEST.outputs.vaultUri`
Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,7 @@ resource keyVault_CRoMbemLF 'Microsoft.KeyVault/vaults@2023-02-01' = {`
`84`	`84`	`name: 'standard'`
`85`	`85`	`family: 'A'`
`86`	`86`	`}`
	`87`	`+ enableRbacAuthorization: true`
`87`	`88`	`}`
`88`	`89`	`}`
`89`	`90`
`@@ -246,3 +247,4 @@ resource applicationSettingsResource_vEe46o8Zn 'Microsoft.Web/sites/config@2021-`
`246`	`247`	`}`
`247`	`248`
`248`	`249`	`output SERVICE_API_IDENTITY_PRINCIPAL_ID string = webSite_W5EweSXEq.identity.principalId`
	`250`	`+output vaultUri string = keyVault_CRoMbemLF.properties.vaultUri`