Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ public static IResourceBuilder<AzureAppConfigurationResource> AddAzureAppConfigu

var resource = new AzureAppConfigurationResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("Settings")
.WithDefaultRoleAssignments(AppConfigurationBuiltInRole.GetBuiltInRoleName,
AppConfigurationBuiltInRole.AppConfigurationDataOwner);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1200,7 +1200,7 @@ private static AzureContainerRegistryResource CreateDefaultAzureContainerRegistr
var resource = new AzureContainerRegistryResource(name, configureInfrastructure);
if (builder.ExecutionContext.IsPublishMode)
{
builder.AddResource(resource);
builder.AddResource(resource).WithIconName("Archive");
}
return resource;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ public static IResourceBuilder<AzureAppServiceEnvironmentResource> AddAzureAppSe

// Create the resource builder first, then attach the registry to avoid recreating builders
var appServiceEnvBuilder = builder.ExecutionContext.IsPublishMode
? builder.AddResource(resource)
? builder.AddResource(resource).WithIconName("Globe")
: builder.CreateResourceBuilder(resource);

appServiceEnvBuilder.WithCrossScopeAcrPullIdentity(
Expand Down Expand Up @@ -551,7 +551,7 @@ private static AzureContainerRegistryResource CreateDefaultAzureContainerRegistr
var resource = new AzureContainerRegistryResource(name, ContainerRegistryInfrastructure.ConfigureContainerRegistry);
if (builder.ExecutionContext.IsPublishMode)
{
builder.AddResource(resource);
builder.AddResource(resource).WithIconName("Archive");
}
return resource;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,8 @@ public static IResourceBuilder<AzureApplicationInsightsResource> AddAzureApplica

var resource = new AzureApplicationInsightsResource(name, configureInfrastructure);

var rb = builder.AddResource(resource);
var rb = builder.AddResource(resource)
.WithIconName("ChartMultiple");

if (logAnalyticsWorkspace != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ public static IResourceBuilder<AzureOpenAIResource> AddAzureOpenAI(this IDistrib

var resource = new AzureOpenAIResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("BrainCircuit")
.WithDefaultRoleAssignments(CognitiveServicesBuiltInRole.GetBuiltInRoleName,
CognitiveServicesBuiltInRole.CognitiveServicesOpenAIUser);
}
Expand Down Expand Up @@ -197,7 +198,8 @@ public static IResourceBuilder<AzureOpenAIDeploymentResource> AddDeployment(this
var deployment = new AzureOpenAIDeploymentResource(name, modelName, modelVersion, builder.Resource);
builder.Resource.AddDeployment(deployment);

return builder.ApplicationBuilder.AddResource(deployment);
return builder.ApplicationBuilder.AddResource(deployment)
.WithIconName("BrainCircuit");
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public static IResourceBuilder<AzureContainerRegistryResource> AddAzureContainer
else
{
resourceBuilder = builder.AddResource(resource)
.WithIconName("Archive")
Comment thread
afscrome marked this conversation as resolved.
Resolved
.WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet<RoleDefinition>()));
}

Expand Down
10 changes: 7 additions & 3 deletions src/Aspire.Hosting.Azure.CosmosDB/AzureCosmosDBExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static IResourceBuilder<AzureCosmosDBResource> AddAzureCosmosDB(this IDis

var resource = new AzureCosmosDBResource(name, ConfigureCosmosDBInfrastructure);
return builder.AddResource(resource)
.WithIconName("DatabaseMultiple")
.WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet<RoleDefinition>()));
}

Expand Down Expand Up @@ -354,7 +355,8 @@ public static IResourceBuilder<AzureCosmosDBDatabaseResource> AddCosmosDatabase(
var database = new AzureCosmosDBDatabaseResource(name, databaseName, builder.Resource);
builder.Resource.Databases.Add(database);

return builder.ApplicationBuilder.AddResource(database);
return builder.ApplicationBuilder.AddResource(database)
.WithIconName("Database");
}

/// <summary>
Expand All @@ -378,7 +380,8 @@ public static IResourceBuilder<AzureCosmosDBContainerResource> AddContainer(this
var container = new AzureCosmosDBContainerResource(name, containerName, partitionKeyPath, builder.Resource);
builder.Resource.Containers.Add(container);

return builder.ApplicationBuilder.AddResource(container);
return builder.ApplicationBuilder.AddResource(container)
.WithIconName("Box");
}

/// <summary>
Expand Down Expand Up @@ -435,7 +438,8 @@ public static IResourceBuilder<AzureCosmosDBContainerResource> AddContainer(this

builder.Resource.Containers.Add(container);

return builder.ApplicationBuilder.AddResource(container);
return builder.ApplicationBuilder.AddResource(container)
.WithIconName("Box");
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public static IResourceBuilder<AzureEventHubsResource> AddAzureEventHubs(

var resource = new AzureEventHubsResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("MailMultiple")
.WithDefaultRoleAssignments(EventHubsBuiltInRole.GetBuiltInRoleName,
EventHubsBuiltInRole.AzureEventHubsDataOwner);
}
Expand Down Expand Up @@ -168,7 +169,8 @@ public static IResourceBuilder<AzureEventHubResource> AddHub(this IResourceBuild
var hub = new AzureEventHubResource(name, hubName, builder.Resource);
builder.Resource.Hubs.Add(hub);

return builder.ApplicationBuilder.AddResource(hub);
return builder.ApplicationBuilder.AddResource(hub)
.WithIconName("Mail");
}

/// <summary>
Expand Down Expand Up @@ -212,7 +214,8 @@ public static IResourceBuilder<AzureEventHubConsumerGroupResource> AddConsumerGr
var consumerGroup = new AzureEventHubConsumerGroupResource(name, groupName, builder.Resource);
builder.Resource.ConsumerGroups.Add(consumerGroup);

return builder.ApplicationBuilder.AddResource(consumerGroup);
return builder.ApplicationBuilder.AddResource(consumerGroup)
.WithIconName("Mail");
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public static IResourceBuilder<AzureFrontDoorResource> AddAzureFrontDoor(
var resource = new AzureFrontDoorResource(name, configureInfrastructure);

return builder.ExecutionContext.IsPublishMode
? builder.AddResource(resource)
? builder.AddResource(resource).WithIconName("GlobeArrowForward")
: builder.CreateResourceBuilder(resource);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ private static IResourceBuilder<AzureFunctionsProjectResource> AddAzureFunctions

#pragma warning disable ASPIREEXTENSION001 // WithDebugSupport is experimental
var functionsBuilder = builder.AddResource(resource)
.WithIconName("Flash")
.WithAnnotation(projectMetadata)
.WithAnnotation(new AzureFunctionsAnnotation())
.WithDebugSupport(mode => new AzureFunctionsLaunchConfiguration { ProjectPath = projectMetadata.ProjectPath, Mode = mode }, "azure-functions");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public static IResourceBuilder<DurableTaskSchedulerResource> AddDurableTaskSched

scheduler.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore);

return builder.AddResource(scheduler);
return builder.AddResource(scheduler)
.WithIconName("CalendarClock");
}

/// <summary>
Expand Down Expand Up @@ -220,7 +221,8 @@ public static IResourceBuilder<DurableTaskHubResource> AddTaskHub(this IResource

hub.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore);

var hubBuilder = builder.ApplicationBuilder.AddResource(hub);
var hubBuilder = builder.ApplicationBuilder.AddResource(hub)
.WithIconName("CalendarClock");

hubBuilder.OnResourceReady(
async (r, e, ct) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ public static IResourceBuilder<AzureKeyVaultResource> AddAzureKeyVault(this IDis

var resource = new AzureKeyVaultResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("Vault")
.WithDefaultRoleAssignments(KeyVaultBuiltInRole.GetBuiltInRoleName,
KeyVaultBuiltInRole.KeyVaultSecretsUser);
}
Expand Down Expand Up @@ -297,7 +298,7 @@ public static IResourceBuilder<AzureKeyVaultSecretResource> AddSecret(this IReso
var secret = new AzureKeyVaultSecretResource(name, name, builder.Resource, parameterResource);
builder.Resource.Secrets.Add(secret);

return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest();
return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest();
}

/// <summary>
Expand All @@ -318,7 +319,7 @@ public static IResourceBuilder<AzureKeyVaultSecretResource> AddSecret(this IReso
var secret = new AzureKeyVaultSecretResource(name, name, builder.Resource, value);
builder.Resource.Secrets.Add(secret);

return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest();
return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest();
}

/// <summary>
Expand Down Expand Up @@ -357,7 +358,7 @@ public static IResourceBuilder<AzureKeyVaultSecretResource> AddSecret(this IReso
var secret = new AzureKeyVaultSecretResource(name, secretName, builder.Resource, parameterResource);
builder.Resource.Secrets.Add(secret);

return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest();
return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest();
}

/// <summary>
Expand All @@ -379,7 +380,7 @@ public static IResourceBuilder<AzureKeyVaultSecretResource> AddSecret(this IReso
var secret = new AzureKeyVaultSecretResource(name, secretName, builder.Resource, value);
builder.Resource.Secrets.Add(secret);

return builder.ApplicationBuilder.AddResource(secret).ExcludeFromManifest();
return builder.ApplicationBuilder.AddResource(secret).WithIconName("LockClosed").ExcludeFromManifest();
}

private static void ValidateSecretName(string secretName)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ public static IResourceBuilder<AzureKubernetesEnvironmentResource> AddAzureKuber
}
}));

return builder.AddResource(resource);
return builder.AddResource(resource)
.WithIconName("ServerMultiple");
Comment thread
afscrome marked this conversation as resolved.
Resolved
Comment thread
afscrome marked this conversation as resolved.
Resolved
}

/// <summary>
Expand Down Expand Up @@ -185,6 +186,7 @@ public static IResourceBuilder<AksNodePoolResource> AddNodePool(
}

return builder.ApplicationBuilder.AddResource(nodePool)
.WithIconName("Cpu")
.ExcludeFromManifest();
}

Expand Down Expand Up @@ -476,6 +478,7 @@ existingDelegation is not null
}

return builder.ApplicationBuilder.AddResource(lb)
.WithIconName("GlobeArrowForward")
.ExcludeFromManifest();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ private Task PrepareAksEnvironmentAsync(PipelineStepContext context)

var defaultPool = new AksNodePoolResource("workload", defaultConfig, environment);
defaultPool.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore);
defaultPool.Annotations.Add(new ResourceIconAnnotation("Cpu"));
appModel.Resources.Add(defaultPool);
return defaultPool;
}
Expand Down Expand Up @@ -188,6 +189,7 @@ private static AksNodePoolResource FindNodePoolResource(
var config = environment.NodePools.First(p => p.Name == poolName);
var pool = new AksNodePoolResource(poolName, config, environment);
pool.Annotations.Add(ManifestPublishingCallbackAnnotation.Ignore);
pool.Annotations.Add(new ResourceIconAnnotation("Cpu"));
appModel.Resources.Add(pool);
return pool;
}
Expand Down
6 changes: 4 additions & 2 deletions src/Aspire.Hosting.Azure.Kusto/AzureKustoBuilderExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ public static IResourceBuilder<AzureKustoClusterResource> AddAzureKustoCluster(t
};

var resource = new AzureKustoClusterResource(name, configureInfrastructure);
var resourceBuilder = builder.AddResource(resource);
var resourceBuilder = builder.AddResource(resource)
.WithIconName("DatabaseMultiple");

AddKustoHealthChecksAndLifecycleManagement(resourceBuilder);
AddKustoCustomCommands(resourceBuilder);
Expand Down Expand Up @@ -116,7 +117,8 @@ public static IResourceBuilder<AzureKustoReadWriteDatabaseResource> AddReadWrite

var kustoDatabase = new AzureKustoReadWriteDatabaseResource(name, databaseName, builder.Resource);
builder.Resource.Databases.Add(kustoDatabase);
var resourceBuilder = builder.ApplicationBuilder.AddResource(kustoDatabase);
var resourceBuilder = builder.ApplicationBuilder.AddResource(kustoDatabase)
.WithIconName("Database");

// Register a health check that will be used to verify database is available
KustoConnectionStringBuilder? kcsb = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ public static IResourceBuilder<AzureNetworkSecurityGroupResource> AddNetworkSecu
return builder.CreateResourceBuilder(resource);
}

return builder.AddResource(resource);
return builder.AddResource(resource)
.WithIconName("ShieldLock");
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ private static IResourceBuilder<AzureVirtualNetworkResource> AddAzureVirtualNetw
return builder.CreateResourceBuilder(resource);
}

return builder.AddResource(resource);
return builder.AddResource(resource)
.WithIconName("Router");
Comment thread
afscrome marked this conversation as resolved.
Resolved
}

private static void ConfigureVirtualNetwork(AzureResourceInfrastructure infra)
Expand Down Expand Up @@ -274,6 +275,7 @@ private static IResourceBuilder<AzureSubnetResource> AddSubnetCore(
}

return builder.ApplicationBuilder.AddResource(subnet)
.WithIconName("Router")
.ExcludeFromManifest();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ public static IResourceBuilder<AzureLogAnalyticsWorkspaceResource> AddAzureLogAn
};

var resource = new AzureLogAnalyticsWorkspaceResource(name, configureInfrastructure);
return builder.AddResource(resource);
return builder.AddResource(resource)
.WithIconName("ChartMultiple");
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ public static IResourceBuilder<AzureManagedRedisResource> AddAzureManagedRedis(

var resource = new AzureManagedRedisResource(name, ConfigureRedisInfrastructure);
return builder.AddResource(resource)
.WithIconName("Database")
.WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet<RoleDefinition>()));
}

Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Azure.Redis/AzureRedisExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ public static IResourceBuilder<AzureRedisCacheResource> AddAzureRedis(

var resource = new AzureRedisCacheResource(name, ConfigureRedisInfrastructure);
return builder.AddResource(resource)
.WithIconName("Database")
.WithAnnotation(new DefaultRoleAssignmentsAnnotation(new HashSet<RoleDefinition>()));
}

Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Azure.Search/AzureSearchExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public static IResourceBuilder<AzureSearchResource> AddAzureSearch(this IDistrib

AzureSearchResource resource = new(name, ConfigureSearch);
return builder.AddResource(resource)
.WithIconName("Search")
.WithDefaultRoleAssignments(SearchBuiltInRole.GetBuiltInRoleName,
SearchBuiltInRole.SearchIndexDataContributor,
SearchBuiltInRole.SearchServiceContributor);
Expand Down
10 changes: 7 additions & 3 deletions src/Aspire.Hosting.Azure.ServiceBus/AzureServiceBusExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,7 @@ public static IResourceBuilder<AzureServiceBusResource> AddAzureServiceBus(this

var resource = new AzureServiceBusResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("MailMultiple")
.WithDefaultRoleAssignments(ServiceBusBuiltInRole.GetBuiltInRoleName,
ServiceBusBuiltInRole.AzureServiceBusDataOwner);
}
Expand Down Expand Up @@ -182,7 +183,8 @@ public static IResourceBuilder<AzureServiceBusQueueResource> AddServiceBusQueue(
var queue = new AzureServiceBusQueueResource(name, queueName, builder.Resource);
builder.Resource.Queues.Add(queue);

return builder.ApplicationBuilder.AddResource(queue);
return builder.ApplicationBuilder.AddResource(queue)
.WithIconName("Mail");
}

/// <summary>
Expand Down Expand Up @@ -267,7 +269,8 @@ public static IResourceBuilder<AzureServiceBusTopicResource> AddServiceBusTopic(
var topic = new AzureServiceBusTopicResource(name, topicName, builder.Resource);
builder.Resource.Topics.Add(topic);

return builder.ApplicationBuilder.AddResource(topic);
return builder.ApplicationBuilder.AddResource(topic)
.WithIconName("Mail");
}

/// <summary>
Expand Down Expand Up @@ -339,7 +342,8 @@ public static IResourceBuilder<AzureServiceBusSubscriptionResource> AddServiceBu
var subscription = new AzureServiceBusSubscriptionResource(name, subscriptionName, builder.Resource);
builder.Resource.Subscriptions.Add(subscription);

return builder.ApplicationBuilder.AddResource(subscription);
return builder.ApplicationBuilder.AddResource(subscription)
.WithIconName("Mail");
}

/// <summary>
Expand Down
1 change: 1 addition & 0 deletions src/Aspire.Hosting.Azure.SignalR/AzureSignalRExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ public static IResourceBuilder<AzureSignalRResource> AddAzureSignalR(this IDistr

var resource = new AzureSignalRResource(name, configureInfrastructure);
return builder.AddResource(resource)
.WithIconName("MailMultiple")
.WithDefaultRoleAssignments(SignalRBuiltInRole.GetBuiltInRoleName, defaultRoles.ToArray());
}

Expand Down
Loading
Loading