From 57c5d98bdc4f37ef0124b67dc78c1e080e01632c Mon Sep 17 00:00:00 2001 From: Alan Ren Date: Wed, 2 Oct 2019 09:33:27 -0700 Subject: [PATCH] make it easy to indicate all platforms (#7467) --- extensions/resource-deployment/package.json | 12 ++---------- extensions/resource-deployment/src/interfaces.ts | 2 +- .../src/services/resourceTypeService.ts | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index 82ea5ad18b..08c6a1d843 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -74,11 +74,7 @@ "name": "sql-image", "displayName": "%resource-type-sql-image-display-name%", "description": "%resource-type-sql-image-description%", - "platforms": [ - "darwin", - "win32", - "linux" - ], + "platforms": "*", "icon": { "light": "./images/sql_server_container.svg", "dark": "./images/sql_server_container_inverse.svg" @@ -208,11 +204,7 @@ "name": "sql-bdc", "displayName": "%resource-type-sql-bdc-display-name%", "description": "%resource-type-sql-bdc-description%", - "platforms": [ - "darwin", - "linux", - "win32" - ], + "platforms": "*", "icon": { "light": "./images/sql_bdc.svg", "dark": "./images/sql_bdc_inverse.svg" diff --git a/extensions/resource-deployment/src/interfaces.ts b/extensions/resource-deployment/src/interfaces.ts index f97f8c04f8..2d2fda804d 100644 --- a/extensions/resource-deployment/src/interfaces.ts +++ b/extensions/resource-deployment/src/interfaces.ts @@ -11,7 +11,7 @@ export interface ResourceType { name: string; displayName: string; description: string; - platforms: string[]; + platforms: string[] | '*'; icon: { light: string; dark: string }; options: ResourceTypeOption[]; providers: DeploymentProvider[]; diff --git a/extensions/resource-deployment/src/services/resourceTypeService.ts b/extensions/resource-deployment/src/services/resourceTypeService.ts index 53f5246f9f..d2751ba8cd 100644 --- a/extensions/resource-deployment/src/services/resourceTypeService.ts +++ b/extensions/resource-deployment/src/services/resourceTypeService.ts @@ -52,7 +52,7 @@ export class ResourceTypeService implements IResourceTypeService { let resourceTypes = this._resourceTypes; if (filterByPlatform) { - resourceTypes = resourceTypes.filter(resourceType => resourceType.platforms.includes(this.platformService.platform())); + resourceTypes = resourceTypes.filter(resourceType => (typeof resourceType.platforms === 'string' && resourceType.platforms === '*') || resourceType.platforms.includes(this.platformService.platform())); } return resourceTypes;