Skip to content

Commit

Permalink
Fix parameter issues (#42070)
Browse files Browse the repository at this point in the history
  • Loading branch information
@JoshLove-msft
JoshLove-msft authored Feb 20, 2024
1 parent a17e403 commit 910632f
Show file tree
Hide file tree
Showing 13 changed files with 48 additions and 26 deletions.
4 changes: 2 additions & 2 deletions sdk/provisioning/Azure.Provisioning/src/Construct.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,13 +279,13 @@ internal void WriteOutputs(MemoryStream stream)
foreach (var output in outputsToWrite)
{
string value;
if (output.IsLiteral || ReferenceEquals(this, output.ModuleSource))
if (output.IsLiteral || ReferenceEquals(this, output.Resource.ModuleScope))
{
value = output.IsLiteral ? $"'{output.Value}'" : output.Value;
}
else
{
value = $"{output.ModuleSource!.Name}.outputs.{output.Name}";
value = $"{output.Resource.ModuleScope!.Name}.outputs.{output.Name}";
}
string name = output.Name;
stream.WriteLine($"output {name} string = {value}");
Expand Down
7 changes: 4 additions & 3 deletions sdk/provisioning/Azure.Provisioning/src/ModuleInfrastructure.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ private void AddOutputsToModules()
// ToList to avoid modifying the collection while iterating
foreach (var output in construct.GetOutputs(false).ToList())
{
output.ModuleSource = output.Resource.ModuleScope!;
output.Resource.ModuleScope!.AddOutput(output);
}
}
Expand Down Expand Up @@ -102,7 +101,6 @@ private void BuildModuleConstructs(Resource resource, Dictionary<Resource, List<
{
root = construct;
construct.IsRoot = true;
parentScope = construct;
}
}

Expand All @@ -112,6 +110,8 @@ private void BuildModuleConstructs(Resource resource, Dictionary<Resource, List<
resource.ModuleScope = parentScope;
}

parentScope ??= construct;

if (parentScope != null)
{
foreach (var parameter in resource.Parameters)
Expand All @@ -131,7 +131,8 @@ private void BuildModuleConstructs(Resource resource, Dictionary<Resource, List<
parameterToCopy.DefaultValue,
parameterToCopy.IsSecure,
parentScope,
parameterToCopy.Value);
parameterToCopy.Value,
parameterToCopy.Output);
}
}
}
Expand Down
1 change: 0 additions & 1 deletion sdk/provisioning/Azure.Provisioning/src/Output.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ public class Output
/// </summary>
public bool IsSecure { get; }
internal IConstruct Source { get; }
internal IConstruct? ModuleSource { get; set; }

internal Resource Resource { get; }

Expand Down
21 changes: 14 additions & 7 deletions sdk/provisioning/Azure.Provisioning/src/Parameter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ public readonly struct Parameter
/// Gets a value indicating whether the parameter is secure.
/// </summary>
public bool IsSecure { get; }
internal bool IsFromOutput { get; }
internal bool IsLiteral { get; }

internal bool IsFromOutput => Output != null;
internal bool IsLiteral => Output?.IsLiteral ?? false;
internal string? Value { get; }
internal IConstruct? Source { get; }
internal Output? Output { get; }
Expand All @@ -43,21 +44,20 @@ public Parameter(Output output)
{
Name = output.Name;
IsSecure = output.IsSecure;
IsFromOutput = true;
IsLiteral = output.IsLiteral;
Value = output.Value;
Source = output.Source;
Output = output;
}

internal Parameter(string name, string? description, object? defaultValue, bool isSecure, IConstruct source, string? value)
internal Parameter(string name, string? description, object? defaultValue, bool isSecure, IConstruct source, string? value, Output? output)
{
Name = name;
Description = description;
DefaultValue = defaultValue;
IsSecure = isSecure;
Source = source;
Value = value;
Output = output;
}

/// <summary>
Expand All @@ -82,14 +82,21 @@ internal string GetParameterString(IConstruct parentScope)
{
return Name;
}

// If the parameter is from an output that is not in the current scope, use the parameter name.
if (!parentScope.GetOutputs().Contains(Output))
{
return Name;
}

// If the parameter is an output from the current scope, use its Value.
if (ReferenceEquals(Output!.ModuleSource, parentScope))
if (ReferenceEquals(Output!.Resource.ModuleScope, parentScope))
{
return Value!;
}

// Otherwise it is an output from a different scope, use the full reference.
return $"{Output!.ModuleSource!.Name}.outputs.{Name}";
return $"{Output!.Resource.ModuleScope!.Name}.outputs.{Name}";
}
}
}
1 change: 1 addition & 0 deletions sdk/provisioning/Azure.Provisioning/src/keyvault/KeyVaultAddAccessPolicy.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public KeyVaultAddAccessPolicy(IConstruct scope, Parameter principalIdParameter,
}))
{
ParameterOverrides.Add(Properties.AccessPolicies[0], new Dictionary<string, Parameter> { { nameof(KeyVaultAccessPolicy.ObjectId), principalIdParameter } });
Parameters.Add(principalIdParameter);
}

private static string GetParamValue(Parameter principalIdParameter, IConstruct scope)
Expand Down
3 changes: 3 additions & 0 deletions sdk/provisioning/Azure.Provisioning/tests/Infrastructure/OutputsSpanningModules/main.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ resource resourceGroup_Q4i0lpa1h 'Microsoft.Resources/resourceGroups@2023-07-01'
module rg1_TEST './resources/rg1_TEST/rg1_TEST.bicep' = {
name: 'rg1_TEST'
scope: resourceGroup_AVG5HpqPz
params: {
SERVICE_API_IDENTITY_PRINCIPAL_ID: rg3_TEST.outputs.SERVICE_API_IDENTITY_PRINCIPAL_ID
}
}

module rg2_TEST './resources/rg2_TEST/rg2_TEST.bicep' = {
Expand Down
6 changes: 5 additions & 1 deletion ...rovisioning/tests/Infrastructure/OutputsSpanningModules/resources/rg1_TEST/rg1_TEST.bicep
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
@secure()
@description('')
param SERVICE_API_IDENTITY_PRINCIPAL_ID string


resource appServicePlan_viooTTlOI 'Microsoft.Web/serverfarms@2021-02-01' = {
name: 'appServicePlan-TEST'
Expand Down Expand Up @@ -44,7 +48,7 @@ resource applicationSettingsResource_MAMFSSuFs 'Microsoft.Web/sites/config@2021-

resource keyVault_BRsYQF4qT 'Microsoft.KeyVault/vaults@2023-02-01' = {
name: 'kv-TEST'
location: LOCATION
location: webSite_dOTaZfna6.location
properties: {
tenantId: '00000000-0000-0000-0000-000000000000'
sku: {
Expand Down
8 changes: 4 additions & 4 deletions ...ure.Provisioning/tests/Infrastructure/StorageBlobDefaults/resources/rg_TEST/rg_TEST.bicep
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

resource storageAccount_o16OWzTQE 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: 'photoacct985209930ac24f6'
resource storageAccount_7Spem00ph 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: 'photoacct4aa56e7da51149b'
location: 'westus'
sku: {
name: 'Premium_LRS'
Expand All @@ -10,8 +10,8 @@ resource storageAccount_o16OWzTQE 'Microsoft.Storage/storageAccounts@2022-09-01'
}
}

resource blobService_b1lTObtBZ 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_o16OWzTQE
resource blobService_Al1mntjNG 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_7Spem00ph
name: 'default'
properties: {
cors: {
Expand Down
8 changes: 4 additions & 4 deletions ...ure.Provisioning/tests/Infrastructure/StorageBlobDropDown/resources/rg_TEST/rg_TEST.bicep
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

resource storageAccount_xlURFCc5A 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: 'photoaccte6de904bc2d5415'
resource storageAccount_xksvj6bLA 'Microsoft.Storage/storageAccounts@2022-09-01' = {
name: 'photoacct420f4454773442c'
location: 'westus'
sku: {
name: 'Premium_LRS'
Expand All @@ -10,8 +10,8 @@ resource storageAccount_xlURFCc5A 'Microsoft.Storage/storageAccounts@2022-09-01'
}
}

resource blobService_AhHMDPJzw 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_xlURFCc5A
resource blobService_OX8Ox5p80 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_xksvj6bLA
name: 'default'
properties: {
cors: {
Expand Down
2 changes: 1 addition & 1 deletion ...ng/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL1/resources/rg_TEST/rg_TEST.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ resource keyVaultAddAccessPolicy_NWCGclP20 'Microsoft.KeyVault/vaults/accessPoli
accessPolicies: [
{
tenantId: '00000000-0000-0000-0000-000000000000'
objectId: SERVICE_API_IDENTITY_PRINCIPAL_ID
objectId: webSite_W5EweSXEq.identity.principalId
permissions: {
secrets: [
'get'
Expand Down
2 changes: 1 addition & 1 deletion ...ng/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL2/resources/rg_TEST/rg_TEST.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ resource keyVaultAddAccessPolicy_NWCGclP20 'Microsoft.KeyVault/vaults/accessPoli
accessPolicies: [
{
tenantId: '00000000-0000-0000-0000-000000000000'
objectId: SERVICE_API_IDENTITY_PRINCIPAL_ID
objectId: webSite_W5EweSXEq.identity.principalId
permissions: {
secrets: [
'get'
Expand Down
2 changes: 1 addition & 1 deletion ...ng/Azure.Provisioning/tests/Infrastructure/WebSiteUsingL3/resources/rg_TEST/rg_TEST.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resource keyVaultAddAccessPolicy_NWCGclP20 'Microsoft.KeyVault/vaults/accessPoli
accessPolicies: [
{
tenantId: '00000000-0000-0000-0000-000000000000'
objectId: SERVICE_API_IDENTITY_PRINCIPAL_ID
objectId: webSite_W5EweSXEq.identity.principalId
permissions: {
secrets: [
'get'
Expand Down
9 changes: 8 additions & 1 deletion sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System;
using System.IO;
using System.Diagnostics;
using System.Linq;
using Azure.Core.TestFramework;
using Azure.Core.Tests.TestFramework;
using Azure.Provisioning.AppService;
Expand Down Expand Up @@ -165,8 +166,14 @@ public void OutputsSpanningModules()
frontEnd2.AssignParameter(data => data.Identity.PrincipalId, new Parameter(output1));
frontEnd2.AssignParameter(data => data.Location, new Parameter(output2));

_ = new TestFrontEndWebSite(infra, parent: rg3);
var testFrontEndWebSite = new TestFrontEndWebSite(infra, parent: rg3);
infra.Build(GetOutputPath());

Assert.AreEqual(3, infra.GetParameters().Count());
Assert.AreEqual(3, infra.GetOutputs().Count());

Assert.AreEqual(0, testFrontEndWebSite.GetParameters().Count());
Assert.AreEqual(1, testFrontEndWebSite.GetOutputs().Count());
}

private static string GetGitRoot()
Expand Down

0 comments on commit 910632f

Please sign in to comment.