From a8750db5042d4d8af73744aeb5ee6d37559281ef Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Tue, 9 Mar 2021 09:45:38 -0500 Subject: [PATCH 1/6] add service fabric svg --- icons/servicefabric.svg | 5 +++++ src/vscodeIntegration/Treeview.ts | 1 + test/Treeview.test.ts | 1 + 3 files changed, 7 insertions(+) create mode 100644 icons/servicefabric.svg diff --git a/icons/servicefabric.svg b/icons/servicefabric.svg new file mode 100644 index 000000000..54b673dee --- /dev/null +++ b/icons/servicefabric.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/src/vscodeIntegration/Treeview.ts b/src/vscodeIntegration/Treeview.ts index 7585bd2b7..cc5a94d78 100644 --- a/src/vscodeIntegration/Treeview.ts +++ b/src/vscodeIntegration/Treeview.ts @@ -109,6 +109,7 @@ const resourceIcons: [string, string][] = [ ["Microsoft.Network/trafficManagerProfiles", "trafficmanagerprofiles.svg"], ["Microsoft.Network/virtualNetworkGateways", "virtualnetworkgateways.svg"], ["Microsoft.Network/virtualNetworks", "virtualnetworks.svg"], + ["Microsoft.ServiceFabric/clusters", "servicefabric.svg"], ["Microsoft.Sql/instancePools", "sqlservers.svg"], ["Microsoft.Sql/locations/instanceFailoverGroups", "sqlservers.svg"], ["Microsoft.Sql/managedInstances", "sqlservers.svg"], diff --git a/test/Treeview.test.ts b/test/Treeview.test.ts index 98d2404e4..0559c887b 100644 --- a/test/Treeview.test.ts +++ b/test/Treeview.test.ts @@ -746,6 +746,7 @@ suite("TreeView", async (): Promise => { getIconObject("publicip.svg", undefined), getIconObject("publicip.svg", undefined), getIconObject("routetables.svg", undefined), + getIconObject("servicefabric.svg", undefined), getIconObject("trafficmanagerprofiles.svg", undefined), getIconObject("virtualnetworkgateways.svg", undefined), getIconObject("virtualnetworks.svg", undefined), From 9b31849f94867aa5119f3e3bc7badef8c91f3f85 Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Wed, 10 Mar 2021 06:24:21 -0500 Subject: [PATCH 2/6] add service fabric svg --- icons/servicefabric.svg | 33 +++++++++++++++++++++++++++++---- test/Treeview.test.ts | 3 +++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/icons/servicefabric.svg b/icons/servicefabric.svg index 54b673dee..a12934dc2 100644 --- a/icons/servicefabric.svg +++ b/icons/servicefabric.svg @@ -1,5 +1,30 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/Treeview.test.ts b/test/Treeview.test.ts index 0559c887b..0c1834cce 100644 --- a/test/Treeview.test.ts +++ b/test/Treeview.test.ts @@ -436,6 +436,9 @@ suite("TreeView", async (): Promise => { { "type": "Microsoft.Network/virtualNetworks" }, + { + "type": "Microsoft.ServiceFabric/clusters" + }, { "type": "Microsoft.Sql/instancePools" }, From c8312369c9b79c89a84fb3a09537a4ae8016ea36 Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Wed, 10 Mar 2021 06:32:02 -0500 Subject: [PATCH 3/6] add loadbalancer svg --- icons/loadbalancers.svg | 16 ++++++++++++++++ src/vscodeIntegration/Treeview.ts | 1 + test/Treeview.test.ts | 4 ++++ 3 files changed, 21 insertions(+) create mode 100644 icons/loadbalancers.svg diff --git a/icons/loadbalancers.svg b/icons/loadbalancers.svg new file mode 100644 index 000000000..46762b606 --- /dev/null +++ b/icons/loadbalancers.svg @@ -0,0 +1,16 @@ + + + + + + + + + Icon-networking-62 + + + + + + + diff --git a/src/vscodeIntegration/Treeview.ts b/src/vscodeIntegration/Treeview.ts index 7585bd2b7..cb924a97c 100644 --- a/src/vscodeIntegration/Treeview.ts +++ b/src/vscodeIntegration/Treeview.ts @@ -100,6 +100,7 @@ const resourceIcons: [string, string][] = [ ["Microsoft.KeyVault/vaults/secrets", "keyvaults.svg"], ["Microsoft.Media/mediaServices", "mediaservices.svg"], ["Microsoft.Network/azureFirewalls", "firewall.svg"], + ["Microsoft.Network/loadBalancers", "loadbalancers.svg"], ["Microsoft.Network/networkInterfaces", "nic.svg"], ["Microsoft.Network/networkSecurityGroups", "nsg.svg"], ["Microsoft.Network/networkSecurityGroups/securityRules", "nsg.svg"], diff --git a/test/Treeview.test.ts b/test/Treeview.test.ts index 98d2404e4..8d24023c5 100644 --- a/test/Treeview.test.ts +++ b/test/Treeview.test.ts @@ -409,6 +409,9 @@ suite("TreeView", async (): Promise => { { "type": "Microsoft.Network/azureFirewalls" }, + { + "type": "Microsoft.Network/loadBalancers" + }, { "type": "Microsoft.Network/networkInterfaces" }, @@ -738,6 +741,7 @@ suite("TreeView", async (): Promise => { getIconObject("applicationinsights.svg", undefined), getIconObject("keyvaults.svg", undefined), getIconObject("keyvaults.svg", undefined), + getIconObject("loadbalancers.svg", undefined), getIconObject("mediaservices.svg", undefined), getIconObject("firewall.svg", undefined), getIconObject("nic.svg", undefined), From b4ec6cb4e867302d16883b0aa79912fe14965404 Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Wed, 10 Mar 2021 06:37:09 -0500 Subject: [PATCH 4/6] add vmss svg --- icons/virtualmachinescalesets.svg | 1 + src/vscodeIntegration/Treeview.ts | 1 + test/Treeview.test.ts | 1 + 3 files changed, 3 insertions(+) create mode 100644 icons/virtualmachinescalesets.svg diff --git a/icons/virtualmachinescalesets.svg b/icons/virtualmachinescalesets.svg new file mode 100644 index 000000000..290ba5ef9 --- /dev/null +++ b/icons/virtualmachinescalesets.svg @@ -0,0 +1 @@ +Icon-compute-34 \ No newline at end of file diff --git a/src/vscodeIntegration/Treeview.ts b/src/vscodeIntegration/Treeview.ts index 7585bd2b7..bd0d92a7d 100644 --- a/src/vscodeIntegration/Treeview.ts +++ b/src/vscodeIntegration/Treeview.ts @@ -62,6 +62,7 @@ const resourceIcons: [string, string][] = [ ["Microsoft.Automation/automationAccounts/webhooks", "automation.svg"], ["Microsoft.Cdn/profiles", "cdnprofiles.svg"], ["Microsoft.Compute/virtualMachines", "virtualmachines.svg"], + ["Microsoft.Compute/virtualMachineScaleSets", "virtualmachinescalesets.svg"], ["Microsoft.Compute/virtualMachines/extensions", "extensions.svg"], ["Microsoft.ContainerInstance/containerGroups", "containerinstances.svg"], ["Microsoft.DocumentDB/databaseAccounts", "cosmosdb.svg"], diff --git a/test/Treeview.test.ts b/test/Treeview.test.ts index 98d2404e4..2f73c8330 100644 --- a/test/Treeview.test.ts +++ b/test/Treeview.test.ts @@ -702,6 +702,7 @@ suite("TreeView", async (): Promise => { getIconObject("automation.svg", undefined), getIconObject("cdnprofiles.svg", undefined), getIconObject("virtualmachines.svg", undefined), + getIconObject("virtualmachinescalesets.svg", undefined), getIconObject("extensions.svg", undefined), getIconObject("containerinstances.svg", undefined), getIconObject("cosmosdb.svg", undefined), From 9baf414771c5d544e3c0785a619ef06c8cbefb36 Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Wed, 10 Mar 2021 06:58:04 -0500 Subject: [PATCH 5/6] add svg icons for loadbalancer, virtual machine scaleset, and service fabric resources --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 078247f05..e7a899822 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to the "vscode-azurearmtools" extension will be documented in this file. +## Version 0.16.0 (2021--) + +### Added + +- Svg icons for loadbalancer, virtual machine scaleset, and service fabric resources. + ## Version 0.15.0 (2021-03-08) ### Added From 29484cd23f793fe809a5eff8b31c86850496dea9 Mon Sep 17 00:00:00 2001 From: Jason Gilbertson Date: Sat, 13 Mar 2021 08:33:37 -0500 Subject: [PATCH 6/6] fix test getIcon: display correct icon --- test/Treeview.test.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/test/Treeview.test.ts b/test/Treeview.test.ts index 68e783fac..37b962c04 100644 --- a/test/Treeview.test.ts +++ b/test/Treeview.test.ts @@ -298,6 +298,9 @@ suite("TreeView", async (): Promise => { { "type": "Microsoft.Compute/virtualMachines/extensions" }, + { + "type": "Microsoft.Compute/virtualMachineScaleSets" + }, { "type": "Microsoft.ContainerInstance/containerGroups" }, @@ -708,8 +711,8 @@ suite("TreeView", async (): Promise => { getIconObject("automation.svg", undefined), getIconObject("cdnprofiles.svg", undefined), getIconObject("virtualmachines.svg", undefined), - getIconObject("virtualmachinescalesets.svg", undefined), getIconObject("extensions.svg", undefined), + getIconObject("virtualmachinescalesets.svg", undefined), getIconObject("containerinstances.svg", undefined), getIconObject("cosmosdb.svg", undefined), getIconObject("cosmosdb.svg", undefined), @@ -745,19 +748,19 @@ suite("TreeView", async (): Promise => { getIconObject("applicationinsights.svg", undefined), getIconObject("keyvaults.svg", undefined), getIconObject("keyvaults.svg", undefined), - getIconObject("loadbalancers.svg", undefined), getIconObject("mediaservices.svg", undefined), getIconObject("firewall.svg", undefined), + getIconObject("loadbalancers.svg", undefined), getIconObject("nic.svg", undefined), getIconObject("nsg.svg", undefined), getIconObject("nsg.svg", undefined), getIconObject("publicip.svg", undefined), getIconObject("publicip.svg", undefined), getIconObject("routetables.svg", undefined), - getIconObject("servicefabric.svg", undefined), getIconObject("trafficmanagerprofiles.svg", undefined), getIconObject("virtualnetworkgateways.svg", undefined), getIconObject("virtualnetworks.svg", undefined), + getIconObject("servicefabric.svg", undefined), getIconObject("sqlservers.svg", undefined), getIconObject("sqlservers.svg", undefined), getIconObject("sqlservers.svg", undefined),