Skip to content

Use linq expressions for parameter assignment #41963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Feb 14, 2024
Merged

Use linq expressions for parameter assignment #41963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d5a071
Use linq expressions for parameter assignment
JoshLove-msft Feb 14, 2024
b43449b
Fix test
JoshLove-msft Feb 14, 2024
faf4d26
Merge branch 'feature/cdk' of https://github.com/Azure/azure-sdk-for-…
JoshLove-msft Feb 14, 2024
3514213
export API
JoshLove-msft Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.net6.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public abstract partial class Resource<T> : Azure.Provisioning.Resource where T
{
protected Resource(Azure.Provisioning.IConstruct scope, Azure.Provisioning.Resource? parent, string resourceName, Azure.Core.ResourceType resourceType, string version, T properties) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(object)) { }
public T Properties { get { throw null; } }
public void AssignParameter(System.Linq.Expressions.Expression<System.Func<T, string>> selector, Azure.Provisioning.Parameter parameter) { }
}
}
namespace Azure.Provisioning.AppService
Expand Down
1 change: 1 addition & 0 deletions sdk/provisioning/Azure.Provisioning/api/Azure.Provisioning.netstandard2.0.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ public abstract partial class Resource<T> : Azure.Provisioning.Resource where T
{
protected Resource(Azure.Provisioning.IConstruct scope, Azure.Provisioning.Resource? parent, string resourceName, Azure.Core.ResourceType resourceType, string version, T properties) : base (default(Azure.Provisioning.IConstruct), default(Azure.Provisioning.Resource), default(string), default(Azure.Core.ResourceType), default(string), default(object)) { }
public T Properties { get { throw null; } }
public void AssignParameter(System.Linq.Expressions.Expression<System.Func<T, string>> selector, Azure.Provisioning.Parameter parameter) { }
}
}
namespace Azure.Provisioning.AppService
Expand Down
20 changes: 20 additions & 0 deletions sdk/provisioning/Azure.Provisioning/src/ResourceOfT.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

using System;
using System.Linq.Expressions;
using Azure.Core;

namespace Azure.Provisioning
Expand Down Expand Up @@ -35,5 +37,23 @@ protected Resource(IConstruct scope, Resource? parent, string resourceName, Reso
{
Properties = properties;
}

/// <summary>
///
/// </summary>
/// <param name="selector"></param>
/// <param name="parameter"></param>
/// <exception cref="NotSupportedException"></exception>
public void AssignParameter(Expression<Func<T, string>> selector, Parameter parameter)
{
if (selector is not LambdaExpression lambda ||
lambda.Body is not MemberExpression member)
{
throw new NotSupportedException();
}

object instance = Expression.Lambda(member.Expression!, lambda.Parameters[0]).Compile().DynamicInvoke(Properties)!;
AssignParameter(instance, member.Member.Name, parameter);
}
}
}
8 changes: 4 additions & 4 deletions sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDefaults/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01'
}
}

resource storageAccount_wIOls6qWR 'Microsoft.Storage/storageAccounts@2022-09-01' = {
resource storageAccount_64QAbICpM 'Microsoft.Storage/storageAccounts@2022-09-01' = {
scope: resourceGroup_I6QNkoPsb
name: 'photoAcct-b238b0e606ba44'
name: 'photoAcct-47cc88f8-4ec0-'
location: 'westus'
sku: {
name: 'Premium_LRS'
Expand All @@ -21,8 +21,8 @@ resource storageAccount_wIOls6qWR 'Microsoft.Storage/storageAccounts@2022-09-01'
}
}

resource blobService_gWmK7aIWs 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_wIOls6qWR
resource blobService_hzBGHAAO1 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_64QAbICpM
name: 'photos-TEST'
properties: {
cors: {
Expand Down
8 changes: 4 additions & 4 deletions sdk/provisioning/Azure.Provisioning/tests/Infrastructure/StorageBlobDropDown/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ resource resourceGroup_I6QNkoPsb 'Microsoft.Resources/resourceGroups@2023-07-01'
}
}

resource storageAccount_zwcoTiJ7t 'Microsoft.Storage/storageAccounts@2022-09-01' = {
resource storageAccount_3AMx4MnVN 'Microsoft.Storage/storageAccounts@2022-09-01' = {
scope: resourceGroup_I6QNkoPsb
name: 'photoAcct-42a20f49579e44'
name: 'photoAcct-e9ffc066-811e-'
location: 'westus'
sku: {
name: 'Premium_LRS'
Expand All @@ -21,8 +21,8 @@ resource storageAccount_zwcoTiJ7t 'Microsoft.Storage/storageAccounts@2022-09-01'
}
}

resource blobService_oQNAHmGlL 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_zwcoTiJ7t
resource blobService_JVW2TmYYM 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' = {
parent: storageAccount_3AMx4MnVN
name: 'photos-TEST'
properties: {
cors: {
Expand Down
6 changes: 3 additions & 3 deletions sdk/provisioning/Azure.Provisioning/tests/ProvisioningTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ public void WebSiteUsingL1()
.AddAccessPolicy(frontEndPrincipalId); // frontEnd.properties.identity.principalId

KeyVaultSecret sqlAdminSecret = new KeyVaultSecret(infra, "sqlAdminPassword");
sqlAdminSecret.AssignParameter(sqlAdminSecret.Properties.Properties, nameof(sqlAdminSecret.Properties.Properties.Value), sqlAdminPasswordParam);
sqlAdminSecret.AssignParameter(secret => secret.Properties.Value, sqlAdminPasswordParam);

KeyVaultSecret appUserSecret = new KeyVaultSecret(infra, "appUserPassword");
appUserSecret.AssignParameter(appUserSecret.Properties.Properties, nameof(appUserSecret.Properties.Properties.Value), appUserPasswordParam);
appUserSecret.AssignParameter(secret => secret.Properties.Value, appUserPasswordParam);

SqlServer sqlServer = new SqlServer(infra, "sqlserver");
sqlServer.AssignParameter(sqlServer.Properties, nameof(sqlServer.Properties.AdministratorLoginPassword), sqlAdminPasswordParam);
sqlServer.AssignParameter(sql => sql.AdministratorLoginPassword, sqlAdminPasswordParam);

SqlDatabase sqlDatabase = new SqlDatabase(infra);

Expand Down
6 changes: 3 additions & 3 deletions sdk/provisioning/Azure.Provisioning/tests/TestCommonSqlDatabase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ public TestCommonSqlDatabase(IConstruct scope, KeyVault? keyVault = null)
AddParameter(appUserPasswordParam);

KeyVaultSecret sqlAdminSecret = new KeyVaultSecret(this, "sqlAdminPassword");
sqlAdminSecret.AssignParameter(sqlAdminSecret.Properties.Properties, nameof(sqlAdminSecret.Properties.Properties.Value), sqlAdminPasswordParam);
sqlAdminSecret.AssignParameter(secret => secret.Properties.Value, sqlAdminPasswordParam);

KeyVaultSecret appUserSecret = new KeyVaultSecret(this, "appUserPassword");
appUserSecret.AssignParameter(appUserSecret.Properties.Properties, nameof(appUserSecret.Properties.Properties.Value), appUserPasswordParam);
appUserSecret.AssignParameter(secret => secret.Properties.Value, appUserPasswordParam);

SqlServer sqlServer = new SqlServer(this, "sqlserver");
sqlServer.AssignParameter(sqlServer.Properties, nameof(sqlServer.Properties.AdministratorLoginPassword), sqlAdminPasswordParam);
sqlServer.AssignParameter(sql => sql.AdministratorLoginPassword, sqlAdminPasswordParam);
SqlDatabase = new SqlDatabase(this);

KeyVaultSecret sqlAzureConnectionStringSecret = new KeyVaultSecret(this, "connectionString", SqlDatabase.GetConnectionString(appUserPasswordParam));
Expand Down