diff --git a/app/scripts/modules/core/src/account/account.service.ts b/app/scripts/modules/core/src/account/account.service.ts index 7ee89e3aaca..29ea6110d03 100644 --- a/app/scripts/modules/core/src/account/account.service.ts +++ b/app/scripts/modules/core/src/account/account.service.ts @@ -23,6 +23,7 @@ export interface IAccount { requiredGroupMembership: string[]; type: string; providerVersion?: string; + skin?: string; } export interface IAccountDetails extends IAccount { diff --git a/app/scripts/modules/core/src/cloudProvider/cloudProvider.module.ts b/app/scripts/modules/core/src/cloudProvider/cloudProvider.module.ts index 591b395ac38..3f590225777 100644 --- a/app/scripts/modules/core/src/cloudProvider/cloudProvider.module.ts +++ b/app/scripts/modules/core/src/cloudProvider/cloudProvider.module.ts @@ -1,14 +1,14 @@ import { module } from 'angular'; import { CLOUD_PROVIDER_LOGO } from './cloudProviderLogo.component'; -import { VERSIONED_CLOUD_PROVIDER_SERVICE } from './versionedCloudProvider.service'; -import { VERSION_SELECTOR_CTRL } from './versionSelection/versionSelector.component'; +import { SKIN_SERVICE } from './skin.service'; +import { SKIN_SELECTOR_CTRL } from './skinSelection/skinSelector.component'; export const CLOUD_PROVIDER_MODULE = 'spinnaker.core.cloudProvider'; module(CLOUD_PROVIDER_MODULE, [ CLOUD_PROVIDER_LOGO, require('./cloudProviderLabel.directive').name, require('./providerSelection/providerSelector.directive').name, - VERSION_SELECTOR_CTRL, - VERSIONED_CLOUD_PROVIDER_SERVICE, + SKIN_SELECTOR_CTRL, + SKIN_SERVICE, ]); diff --git a/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.spec.ts b/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.spec.ts index 575a0e1908e..872cd6503e7 100644 --- a/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.spec.ts +++ b/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.spec.ts @@ -103,24 +103,24 @@ describe('cloudProviderRegistry: API', function() { }); }); - describe('versioned provider configs', () => { - it('returns a value from a versioned provider config when providerVersion is specified', () => { - configurer.registerProvider('kubernetes', { name: 'kubernetes', providerVersion: 'v1' }); - configurer.registerProvider('kubernetes', { name: 'kubernetes', providerVersion: 'v2' }); + describe('skinned provider configs', () => { + it('returns a value from a skinned provider config when skin is specified', () => { + configurer.registerProvider('kubernetes', { name: 'kubernetes', skin: 'v1' }); + configurer.registerProvider('kubernetes', { name: 'kubernetes', skin: 'v2' }); - expect(configurer.$get().getValue('kubernetes', 'providerVersion', 'v1')).toBe('v1'); - expect(configurer.$get().getValue('kubernetes', 'providerVersion', 'v2')).toBe('v2'); + expect(configurer.$get().getValue('kubernetes', 'skin', 'v1')).toBe('v1'); + expect(configurer.$get().getValue('kubernetes', 'skin', 'v2')).toBe('v2'); }); - it('returns a value from the default version if providerVersion is not specified', () => { - configurer.registerProvider('kubernetes', { name: 'kubernetes', providerVersion: 'v1' }); - configurer.registerProvider('kubernetes', { name: 'kubernetes', providerVersion: 'v2', defaultVersion: true }); + it('returns a value from the default skin if skin is not specified', () => { + configurer.registerProvider('kubernetes', { name: 'kubernetes', skin: 'v1' }); + configurer.registerProvider('kubernetes', { name: 'kubernetes', skin: 'v2', defaultSkin: true }); - expect(configurer.$get().getValue('kubernetes', 'providerVersion')).toBe('v2'); + expect(configurer.$get().getValue('kubernetes', 'skin')).toBe('v2'); }); // This behavior is implicitly tested in other tests, but demonstrates that the provider - // configs do not need to add a `defaultVersion` flag if there is only one config for that provider. + // configs do not need to add a `defaultSkin` flag if there is only one config for that provider. it('behaves reasonably if a provider does not define a default config version', () => { configurer.registerProvider('gce', { name: 'gce', key: 'value' }); diff --git a/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.ts b/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.ts index d9522f82cd0..af66445bca5 100644 --- a/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.ts +++ b/app/scripts/modules/core/src/cloudProvider/cloudProvider.registry.ts @@ -12,7 +12,8 @@ export interface ICloudProviderConfig { name: string; logo?: ICloudProviderLogo; providerVersion?: string; - defaultVersion?: boolean; + skin?: string; + defaultSkin?: boolean; [attribute: string]: any; } @@ -25,30 +26,30 @@ class Providers { // The tests depend on this behavior, but maybe something else does as well. this.providers = without( this.providers, - this.providers.find(p => p.cloudProvider === cloudProvider && p.config.providerVersion === config.providerVersion) + this.providers.find(p => p.cloudProvider === cloudProvider && p.config.skin === config.skin) ).concat([{ cloudProvider, config }]); } - public get(cloudProvider: string, providerVersion?: string): ICloudProviderConfig { - if (providerVersion) { - const provider = this.providers.find(p => p.cloudProvider === cloudProvider && p.config.providerVersion === providerVersion); - return provider ? provider.config : this.getDefaultConfig(cloudProvider); + public get(cloudProvider: string, skin?: string): ICloudProviderConfig { + if (skin) { + const provider = this.providers.find(p => p.cloudProvider === cloudProvider && p.config.skin === skin); + return provider ? provider.config : this.getDefaultSkin(cloudProvider); } else { - return this.getDefaultConfig(cloudProvider); + return this.getDefaultSkin(cloudProvider); } } - public has(cloudProvider: string, providerVersion?: string): boolean { - return !!this.get(cloudProvider, providerVersion); + public has(cloudProvider: string, skin?: string): boolean { + return !!this.get(cloudProvider, skin); } public keys(): string[] { return uniq(this.providers.map(p => p.cloudProvider)); } - private getDefaultConfig(cloudProvider: string): ICloudProviderConfig { - const provider = this.providers.some(p => p.cloudProvider === cloudProvider && p.config.defaultVersion) - ? this.providers.find(p => p.cloudProvider === cloudProvider && p.config.defaultVersion) + private getDefaultSkin(cloudProvider: string): ICloudProviderConfig { + const provider = this.providers.some(p => p.cloudProvider === cloudProvider && p.config.defaultSkin) + ? this.providers.find(p => p.cloudProvider === cloudProvider && p.config.defaultSkin) : this.providers.find(p => p.cloudProvider === cloudProvider); return provider ? provider.config : null; } @@ -70,20 +71,20 @@ export class CloudProviderRegistry { } } - public getProvider(cloudProvider: string, providerVersion?: string): ICloudProviderConfig { - return this.providers.has(cloudProvider, providerVersion) ? cloneDeep(this.providers.get(cloudProvider, providerVersion)) : null; + public getProvider(cloudProvider: string, skin?: string): ICloudProviderConfig { + return this.providers.has(cloudProvider, skin) ? cloneDeep(this.providers.get(cloudProvider, skin)) : null; } public listRegisteredProviders(): string[] { return Array.from(this.providers.keys()); } - public overrideValue(cloudProvider: string, key: string, overrideValue: any, providerVersion?: string) { - if (!this.providers.has(cloudProvider, providerVersion)) { - console.warn(`Cannot override "${key}" for provider "${cloudProvider}${providerVersion ? `:${providerVersion}` : ''}" (provider not registered)`); + public overrideValue(cloudProvider: string, key: string, overrideValue: any, skin?: string) { + if (!this.providers.has(cloudProvider, skin)) { + console.warn(`Cannot override "${key}" for provider "${cloudProvider}${skin ? `:${skin}` : ''}" (provider not registered)`); return; } - const config = this.providers.get(cloudProvider, providerVersion), + const config = this.providers.get(cloudProvider, skin), parentKeys = key.split('.'), lastKey = parentKeys.pop(); let current = config; @@ -98,15 +99,15 @@ export class CloudProviderRegistry { current[lastKey] = overrideValue; } - public hasValue(cloudProvider: string, key: string, providerVersion?: string) { - return this.providers.has(cloudProvider, providerVersion) && this.getValue(cloudProvider, key, providerVersion) !== null; + public hasValue(cloudProvider: string, key: string, skin?: string) { + return this.providers.has(cloudProvider, skin) && this.getValue(cloudProvider, key, skin) !== null; } - public getValue(cloudProvider: string, key: string, providerVersion?: string): any { - if (!key || !this.providers.has(cloudProvider, providerVersion)) { + public getValue(cloudProvider: string, key: string, skin?: string): any { + if (!key || !this.providers.has(cloudProvider, skin)) { return null; } - const config = this.getProvider(cloudProvider, providerVersion), + const config = this.getProvider(cloudProvider, skin), keyParts = key.split('.'); let current = config, notFound = false; diff --git a/app/scripts/modules/core/src/cloudProvider/index.ts b/app/scripts/modules/core/src/cloudProvider/index.ts index 992c7d61cea..a1f0da86c73 100644 --- a/app/scripts/modules/core/src/cloudProvider/index.ts +++ b/app/scripts/modules/core/src/cloudProvider/index.ts @@ -2,4 +2,4 @@ export * from './cloudProvider.registry'; export * from './CloudProviderLogo'; export * from './providerSelection/providerSelection.service'; export * from './providerService.delegate'; -export * from './versionedCloudProvider.service'; +export * from './skin.service'; diff --git a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.spec.ts b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.spec.ts index 86a01049e2d..81216ff4a1d 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.spec.ts +++ b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.spec.ts @@ -186,7 +186,7 @@ describe('providerSelectionService: API', () => { let provider = ''; hasValue = true; const k8s = fakeAccount('kubernetes'); - k8s.providerVersion = 'v2'; + k8s.skin = 'v2'; accounts = [k8s]; cloudProvider.registerProvider('kubernetes', config); SETTINGS.defaultProvider = 'defaultProvider'; @@ -203,7 +203,7 @@ describe('providerSelectionService: API', () => { let provider = ''; hasValue = true; const k8s = fakeAccount('kubernetes'); - k8s.providerVersion = 'v2'; + k8s.skin = 'v2'; accounts = [k8s, fakeAccount('titus')]; cloudProvider.registerProvider('titus', config); cloudProvider.registerProvider('kubernetes', config); diff --git a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts index af08e5719ab..bedb47b86c0 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts +++ b/app/scripts/modules/core/src/cloudProvider/providerSelection/providerSelection.service.ts @@ -30,7 +30,7 @@ export class ProviderSelectionService { if (filterFn) { reducedAccounts = reducedAccounts.filter((acc: IAccountDetails) => { - return filterFn(application, acc, this.cloudProviderRegistry.getProvider(acc.cloudProvider, acc.providerVersion)); + return filterFn(application, acc, this.cloudProviderRegistry.getProvider(acc.cloudProvider, acc.skin)); }); } diff --git a/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts b/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts index cbc7e3cc006..799d0dc4c56 100644 --- a/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts +++ b/app/scripts/modules/core/src/cloudProvider/providerService.delegate.ts @@ -7,13 +7,13 @@ export class ProviderServiceDelegate { constructor(private $injector: IInjectorService, private cloudProviderRegistry: any) { 'ngInject'; } - public hasDelegate(provider: string, serviceKey: string, providerVersion?: string): boolean { - const service: string = this.cloudProviderRegistry.getValue(provider, serviceKey, providerVersion); + public hasDelegate(provider: string, serviceKey: string, skin?: string): boolean { + const service: string = this.cloudProviderRegistry.getValue(provider, serviceKey, skin); return this.$injector.has(service); } - public getDelegate(provider: string, serviceKey: string, providerVersion?: string): T { - const service = this.cloudProviderRegistry.getValue(provider, serviceKey, providerVersion); + public getDelegate(provider: string, serviceKey: string, skin?: string): T { + const service = this.cloudProviderRegistry.getValue(provider, serviceKey, skin); if (this.$injector.has(service)) { return this.$injector.get(service, 'providerDelegate'); } else { diff --git a/app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.spec.ts b/app/scripts/modules/core/src/cloudProvider/skin.service.spec.ts similarity index 63% rename from app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.spec.ts rename to app/scripts/modules/core/src/cloudProvider/skin.service.spec.ts index eb63ca5a3b4..4dbf7836eda 100644 --- a/app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.spec.ts +++ b/app/scripts/modules/core/src/cloudProvider/skin.service.spec.ts @@ -2,14 +2,14 @@ import { mock, IRootScopeService, IScope, IQService } from 'angular'; import { CLOUD_PROVIDER_REGISTRY } from './cloudProvider.registry'; import { ACCOUNT_SERVICE } from 'core/account/account.service'; -import { VERSIONED_CLOUD_PROVIDER_SERVICE, VersionedCloudProviderService } from './versionedCloudProvider.service'; +import { SKIN_SERVICE, SkinService } from './skin.service'; import { APPLICATION_MODEL_BUILDER, ApplicationModelBuilder } from 'core/application'; -describe('Service: versionedCloudProviderService', () => { - let service: VersionedCloudProviderService, appBuilder: ApplicationModelBuilder, scope: IScope, $q: IQService; +describe('Service: skinService', () => { + let service: SkinService, appBuilder: ApplicationModelBuilder, scope: IScope, $q: IQService; beforeEach((mock.module( - VERSIONED_CLOUD_PROVIDER_SERVICE, + SKIN_SERVICE, APPLICATION_MODEL_BUILDER, CLOUD_PROVIDER_REGISTRY, ACCOUNT_SERVICE, @@ -18,41 +18,41 @@ describe('Service: versionedCloudProviderService', () => { beforeEach( mock.inject(($rootScope: IRootScopeService, _$q_: IQService, - versionedCloudProviderService: VersionedCloudProviderService, + skinService: SkinService, applicationModelBuilder: ApplicationModelBuilder) => { - service = versionedCloudProviderService; + service = skinService; appBuilder = applicationModelBuilder; scope = $rootScope.$new(); $q = _$q_; } )); - describe('instance provider version disambiguation', () => { + describe('instance skin disambiguation', () => { beforeEach(() => { spyOn(service, 'getAccounts').and.returnValue( $q.resolve([ - { name: 'v1-k8s-account', cloudProvider: 'kubernetes', providerVersion: 'v1' }, - { name: 'v2-k8s-account', cloudProvider: 'kubernetes', providerVersion: 'v2' }, - { name: 'appengine-account', cloudProvider: 'appengine', providerVersion: 'v1' }, + { name: 'v1-k8s-account', cloudProvider: 'kubernetes', skin: 'v1' }, + { name: 'v2-k8s-account', cloudProvider: 'kubernetes', skin: 'v2' }, + { name: 'appengine-account', cloudProvider: 'appengine', skin: 'v1' }, { name: 'gce-account', cloudProvider: 'gce' }, ]) ); }); - it('uses available accounts to determine provider version if possible', () => { + it('uses available accounts to determine skin if possible', () => { const app = appBuilder.createStandaloneApplication('myApp'); - service.getInstanceProviderVersion('appengine', 'my-instance-id', app).then(providerVersion => { - expect(providerVersion).toEqual('v1'); + service.getInstanceSkin('appengine', 'my-instance-id', app).then(skin => { + expect(skin).toEqual('v1'); }); - service.getInstanceProviderVersion('gce', 'my-instance-id', app).then(providerVersion => { - expect(providerVersion).toEqual(null); + service.getInstanceSkin('gce', 'my-instance-id', app).then(skin => { + expect(skin).toEqual(null); }); scope.$digest(); }); - it('scrapes application server groups to determine provider version if possible', () => { + it('scrapes application server groups to determine skin if possible', () => { const app = appBuilder.createApplication('myApp', [ { key: 'serverGroups', @@ -74,14 +74,14 @@ describe('Service: versionedCloudProviderService', () => { } ]); - service.getInstanceProviderVersion('kubernetes', 'my-instance-id', app).then(providerVersion => { - expect(providerVersion).toEqual('v2'); + service.getInstanceSkin('kubernetes', 'my-instance-id', app).then(skin => { + expect(skin).toEqual('v2'); }); scope.$digest(); }); - it('scrapes application load balancers to determine provider version if possible', () => { + it('scrapes application load balancers to determine skin if possible', () => { const app = appBuilder.createApplication('myApp', [ { key: 'loadBalancers', @@ -102,14 +102,14 @@ describe('Service: versionedCloudProviderService', () => { }, ]); - service.getInstanceProviderVersion('kubernetes', 'my-instance-id', app).then(providerVersion => { - expect(providerVersion).toEqual('v2'); + service.getInstanceSkin('kubernetes', 'my-instance-id', app).then(skin => { + expect(skin).toEqual('v2'); }); scope.$digest(); }); - it('scrapes application load balancers\' server groups to determine provider version if possible', () => { + it('scrapes application load balancers\' server groups to determine skin if possible', () => { const app = appBuilder.createApplication('myApp', [ { key: 'loadBalancers', @@ -132,8 +132,8 @@ describe('Service: versionedCloudProviderService', () => { }, ]); - service.getInstanceProviderVersion('kubernetes', 'my-instance-id', app).then(providerVersion => { - expect(providerVersion).toEqual('v2'); + service.getInstanceSkin('kubernetes', 'my-instance-id', app).then(skin => { + expect(skin).toEqual('v2'); }); scope.$digest(); diff --git a/app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.ts b/app/scripts/modules/core/src/cloudProvider/skin.service.ts similarity index 77% rename from app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.ts rename to app/scripts/modules/core/src/cloudProvider/skin.service.ts index a8c1b249b53..b31e265410f 100644 --- a/app/scripts/modules/core/src/cloudProvider/versionedCloudProvider.service.ts +++ b/app/scripts/modules/core/src/cloudProvider/skin.service.ts @@ -7,7 +7,7 @@ import { CloudProviderRegistry } from 'core/cloudProvider'; import { ILoadBalancer, IServerGroup } from 'core/domain'; import { Application } from 'core/application'; -export class VersionedCloudProviderService { +export class SkinService { constructor(private $log: ILogService, private $q: IQService, @@ -19,48 +19,48 @@ export class VersionedCloudProviderService { public getValue(cloudProvider: string, accountName: string, key: string): IPromise { return this.getAccounts().then(accounts => { const account = accounts.find(a => a.name === accountName && a.cloudProvider === cloudProvider); - return (account && account.providerVersion) - ? this.cloudProviderRegistry.getValue(cloudProvider, key, account.providerVersion) + return (account && account.skin) + ? this.cloudProviderRegistry.getValue(cloudProvider, key, account.skin) : this.cloudProviderRegistry.getValue(cloudProvider, key); }); } - public getInstanceProviderVersion(cloudProvider: string, instanceId: string, app: Application): IPromise { + public getInstanceSkin(cloudProvider: string, instanceId: string, app: Application): IPromise { return this.getAccounts().then(accounts => { - const providerVersions = accounts.reduce( + const skins = accounts.reduce( (versions, account) => { - if (account.cloudProvider === cloudProvider && !!account.providerVersion) { - versions.add(account.providerVersion); + if (account.cloudProvider === cloudProvider && !!account.skin) { + versions.add(account.skin); } return versions; }, new Set(), ); - if (providerVersions.size === 0) { - // Rely on the cloudProviderRegistry to return the default provider implementation. + if (skins.size === 0) { + // Rely on the cloudProviderRegistry to return the default skin implementation. return null; - } else if (providerVersions.size === 1) { - return Array.from(providerVersions)[0]; + } else if (skins.size === 1) { + return Array.from(skins)[0]; } return app.ready().then(() => { for (const serverGroup of (app.getDataSource('serverGroups').data as IServerGroup[])) { if (serverGroup.cloudProvider === cloudProvider && (serverGroup.instances || []).some(instance => instance.id === instanceId)) { - return this.mapAccountToProviderVersion(serverGroup.account); + return this.mapAccountToSkin(serverGroup.account); } } for (const loadBalancer of (app.getDataSource('loadBalancers').data as ILoadBalancer[])) { if (loadBalancer.cloudProvider === cloudProvider) { if ((loadBalancer.instances || []).some(instance => instance.id === instanceId)) { - return this.mapAccountToProviderVersion(loadBalancer.account); + return this.mapAccountToSkin(loadBalancer.account); } // Hit a crazy Babel bug - can't return from a nested for...of loop. for (let i = 0; i < (loadBalancer.serverGroups || []).length; i++) { const serverGroup = loadBalancer.serverGroups[i]; if (serverGroup.isDisabled && (serverGroup.instances || []).some(instance => instance.id === instanceId)) { - return this.mapAccountToProviderVersion(loadBalancer.account); + return this.mapAccountToSkin(loadBalancer.account); } } } @@ -99,14 +99,14 @@ export class VersionedCloudProviderService { }); } - private mapAccountToProviderVersion(accountName: string): IPromise { + private mapAccountToSkin(accountName: string): IPromise { return this.getAccounts().then(accounts => { const account = accounts.find(a => a.name === accountName); - return account ? account.providerVersion : null; + return account ? account.skin : null; }); } } -export const VERSIONED_CLOUD_PROVIDER_SERVICE = 'spinnaker.core.versionedCloudProvider.service'; -module(VERSIONED_CLOUD_PROVIDER_SERVICE, []) - .service('versionedCloudProviderService', VersionedCloudProviderService); +export const SKIN_SERVICE = 'spinnaker.core.skin.service'; +module(SKIN_SERVICE, []) + .service('skinService', SkinService); diff --git a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelection.service.ts b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts similarity index 58% rename from app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelection.service.ts rename to app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts index 15cd3e62841..d76aec814e7 100644 --- a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelection.service.ts +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelection.service.ts @@ -5,28 +5,28 @@ import { isNil, uniq } from 'lodash'; import { ACCOUNT_SERVICE, AccountService } from 'core/account/account.service'; import { CLOUD_PROVIDER_REGISTRY, CloudProviderRegistry } from 'core/cloudProvider/cloudProvider.registry'; -export class VersionSelectionService { +export class SkinSelectionService { constructor(private $uibModal: IModalService, private accountService: AccountService, private cloudProviderRegistry: CloudProviderRegistry) { 'ngInject'; } - public selectVersion(provider: string): IPromise { + public selectSkin(provider: string): IPromise { return this.accountService.getAllAccountDetailsForProvider(provider).then(accounts => { - const versions = uniq(accounts.map((a) => a.providerVersion) + const skins = uniq(accounts.map((a) => a.skin) .filter((v) => !isNil(v))); - if (versions.length === 0) { - return this.cloudProviderRegistry.getProvider(provider).providerVersion - } else if (versions.length === 1) { - return versions[0]; + if (skins.length === 0) { + return this.cloudProviderRegistry.getProvider(provider).skin; + } else if (skins.length === 1) { + return skins[0]; } else { return this.$uibModal.open({ - templateUrl: require('./versionSelector.html'), - controller: 'versionSelectorCtrl as ctrl', + templateUrl: require('./skinSelector.html'), + controller: 'skinSelectorCtrl as ctrl', resolve: { - versionOptions: () => versions + skinOptions: () => skins } }).result; } @@ -34,8 +34,8 @@ export class VersionSelectionService { } } -export const VERSION_SELECTION_SERVICE = 'spinnaker.core.cloudProvider.versionSelection.service'; -module(VERSION_SELECTION_SERVICE, [ +export const SKIN_SELECTION_SERVICE = 'spinnaker.core.cloudProvider.skinSelection.service'; +module(SKIN_SELECTION_SERVICE, [ ACCOUNT_SERVICE, CLOUD_PROVIDER_REGISTRY, -]).service('versionSelectionService', VersionSelectionService); +]).service('skinSelectionService', SkinSelectionService); diff --git a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.component.ts b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts similarity index 51% rename from app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.component.ts rename to app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts index 81b4b0cfa20..a1295a63ff7 100644 --- a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.component.ts +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.component.ts @@ -5,20 +5,20 @@ import { IController, module } from 'angular'; import { ACCOUNT_SERVICE } from 'core/account/account.service'; import { CLOUD_PROVIDER_REGISTRY } from 'core/cloudProvider/cloudProvider.registry'; -export class VersionSelectorCtrl implements IController { - public command: any = { version: '' }; +export class SkinSelectorCtrl implements IController { + public command = { skin: '' }; - constructor(public versionOptions: string[], + constructor(public skinOptions: string[], private $uibModalInstance: IModalInstanceService) { 'ngInject'; - if (versionOptions.length > 0) { - this.command.version = versionOptions[0]; + if (skinOptions.length > 0) { + this.command.skin = skinOptions[0]; } } public selectVersion(): void { - this.$uibModalInstance.close(this.command.version); + this.$uibModalInstance.close(this.command.skin); } public cancel(): void { @@ -26,9 +26,9 @@ export class VersionSelectorCtrl implements IController { } } -export const VERSION_SELECTOR_CTRL = 'spinnaker.core.cloudProvider.versionSelector.controller'; +export const SKIN_SELECTOR_CTRL = 'spinnaker.core.cloudProvider.skinSelector.controller'; -module(VERSION_SELECTOR_CTRL, [ +module(SKIN_SELECTOR_CTRL, [ ACCOUNT_SERVICE, CLOUD_PROVIDER_REGISTRY, -]).controller('versionSelectorCtrl', VersionSelectorCtrl); +]).controller('skinSelectorCtrl', SkinSelectorCtrl); diff --git a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.html b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html similarity index 63% rename from app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.html rename to app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html index 40f336bd0dc..6bcdfdcf7e0 100644 --- a/app/scripts/modules/core/src/cloudProvider/versionSelection/versionSelector.html +++ b/app/scripts/modules/core/src/cloudProvider/skinSelection/skinSelector.html @@ -7,17 +7,17 @@

Select Your Provider's Version

Version
- diff --git a/app/scripts/modules/core/src/cluster/allClusters.controller.js b/app/scripts/modules/core/src/cluster/allClusters.controller.js index b508e5f582c..ae3ee21ad8b 100644 --- a/app/scripts/modules/core/src/cluster/allClusters.controller.js +++ b/app/scripts/modules/core/src/cluster/allClusters.controller.js @@ -10,7 +10,7 @@ import { INSIGHT_NGMODULE } from 'core/insight/insight.module'; import { CLUSTER_FILTER_MODEL } from '../cluster/filter/clusterFilter.model'; import { FILTER_TAGS_COMPONENT } from '../filterModel/filterTags.component'; import { PROVIDER_SELECTION_SERVICE } from 'core/cloudProvider/providerSelection/providerSelection.service'; -import { VERSION_SELECTION_SERVICE } from 'core/cloudProvider/versionSelection/versionSelection.service'; +import { SKIN_SELECTION_SERVICE } from 'core/cloudProvider/skinSelection/skinSelection.service'; import './rollups.less'; @@ -21,7 +21,7 @@ module.exports = angular.module('spinnaker.core.cluster.allClusters.controller', CLUSTER_FILTER, require('../account/account.module').name, PROVIDER_SELECTION_SERVICE, - VERSION_SELECTION_SERVICE, + SKIN_SELECTION_SERVICE, SERVER_GROUP_COMMAND_BUILDER_SERVICE, FILTER_TAGS_COMPONENT, require('../utils/waypoints/waypointContainer.directive').name, @@ -31,7 +31,7 @@ module.exports = angular.module('spinnaker.core.cluster.allClusters.controller', ]) .controller('AllClustersCtrl', function($scope, app, $uibModal, $timeout, providerSelectionService, clusterFilterService, clusterFilterModel, MultiselectModel, insightFilterStateModel, serverGroupCommandBuilder, cloudProviderRegistry, - versionSelectionService) { + skinSelectionService) { this.$onInit = () => { insightFilterStateModel.filtersHidden = true; // hidden to prevent filter flashing for on-demand apps @@ -94,7 +94,7 @@ module.exports = angular.module('spinnaker.core.cluster.allClusters.controller', this.createServerGroup = function createServerGroup() { providerSelectionService.selectProvider(app, 'serverGroup').then(function(selectedProvider) { - versionSelectionService.selectVersion(selectedProvider).then(function(selectedVersion) { + skinSelectionService.selectSkin(selectedProvider).then(function(selectedVersion) { let provider = cloudProviderRegistry.getValue(selectedProvider, 'serverGroup', selectedVersion); $uibModal.open({ templateUrl: provider.cloneServerGroupTemplateUrl, diff --git a/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx b/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx index 3e3a5d49baf..406dca973bb 100644 --- a/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx +++ b/app/scripts/modules/core/src/instance/details/InstanceDetails.tsx @@ -29,12 +29,12 @@ export class InstanceDetails extends React.Component(); public componentDidMount() { - const { versionedCloudProviderService } = ReactInjector; + const { skinService } = ReactInjector; this.props$ .do(() => this.setState({ loading: true, accountId: null })) .switchMap(({ app, $stateParams }) => { - const acct = versionedCloudProviderService.getAccountForInstance($stateParams.provider, $stateParams.instanceId, app); + const acct = skinService.getAccountForInstance($stateParams.provider, $stateParams.instanceId, app); return Observable.fromPromise(acct); }) .takeUntil(this.destroy$) diff --git a/app/scripts/modules/core/src/instance/instance.states.ts b/app/scripts/modules/core/src/instance/instance.states.ts index 4c8fa420cd2..9818caa274c 100644 --- a/app/scripts/modules/core/src/instance/instance.states.ts +++ b/app/scripts/modules/core/src/instance/instance.states.ts @@ -4,7 +4,7 @@ import { StateParams } from '@uirouter/angularjs'; import { APPLICATION_STATE_PROVIDER, ApplicationStateProvider, } from 'core/application'; import { INestedState, STATE_CONFIG_PROVIDER, StateConfigProvider } from 'core/navigation'; import { Application } from 'core/application'; -import { VersionedCloudProviderService } from 'core/cloudProvider'; +import { SkinService } from 'core/cloudProvider'; import { ApplicationModelBuilder } from '../application/applicationModel.builder'; import { InstanceDetails } from './details/InstanceDetails'; @@ -65,10 +65,10 @@ module(INSTANCE_STATES, [ views: { 'main@': { templateUrl: require('../presentation/standalone.view.html'), - controllerProvider: ['$stateParams', 'versionedCloudProviderService', + controllerProvider: ['$stateParams', 'skinService', ($stateParams: StateParams, - versionedCloudProviderService: VersionedCloudProviderService) => { - return versionedCloudProviderService.getValue($stateParams.provider, $stateParams.account, 'instance.detailsController'); + skinService: SkinService) => { + return skinService.getValue($stateParams.provider, $stateParams.account, 'instance.detailsController'); }], controllerAs: 'ctrl' } diff --git a/app/scripts/modules/core/src/loadBalancer/CreateLoadBalancerButton.tsx b/app/scripts/modules/core/src/loadBalancer/CreateLoadBalancerButton.tsx index a2d676d5428..496fe390e1e 100644 --- a/app/scripts/modules/core/src/loadBalancer/CreateLoadBalancerButton.tsx +++ b/app/scripts/modules/core/src/loadBalancer/CreateLoadBalancerButton.tsx @@ -37,11 +37,11 @@ export class CreateLoadBalancerButton extends React.Component { - versionSelectionService.selectVersion(selectedProvider).then((selectedVersion) => { - const provider = cloudProviderRegistry.getValue(selectedProvider, 'loadBalancer', selectedVersion); + skinSelectionService.selectSkin(selectedProvider).then((selectedSkin) => { + const provider = cloudProviderRegistry.getValue(selectedProvider, 'loadBalancer', selectedSkin); if (provider.CreateLoadBalancerModal) { // react diff --git a/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts b/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts index 781d7c97838..e476e8d6620 100644 --- a/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts +++ b/app/scripts/modules/core/src/loadBalancer/loadBalancer.states.ts @@ -5,13 +5,13 @@ import { INestedState, StateConfigProvider } from 'core/navigation'; import { APPLICATION_STATE_PROVIDER, ApplicationStateProvider } from 'core/application'; import { filterModelConfig } from 'core/loadBalancer/filter/loadBalancerFilter.model'; import { LoadBalancers } from 'core/loadBalancer/LoadBalancers'; -import { VERSIONED_CLOUD_PROVIDER_SERVICE } from 'core/cloudProvider'; +import { SKIN_SERVICE } from 'core/cloudProvider'; import { LoadBalancerDetails } from './LoadBalancerDetails'; export const LOAD_BALANCER_STATES = 'spinnaker.core.loadBalancer.states'; module(LOAD_BALANCER_STATES, [ APPLICATION_STATE_PROVIDER, - VERSIONED_CLOUD_PROVIDER_SERVICE, + SKIN_SERVICE, ]).config((applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const loadBalancerDetails: INestedState = { name: 'loadBalancerDetails', diff --git a/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx b/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx index 57b87d8b643..a0eecbd1d9d 100644 --- a/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx +++ b/app/scripts/modules/core/src/overrideRegistry/Overridable.tsx @@ -96,20 +96,20 @@ export function overridableComponent

( { const providerAccounts = accounts.filter(acc => acc.cloudProvider === providerKey); return !!providerAccounts.find(acc => { - const provider = this.cloudProviderRegistryProvider.getProvider(acc.cloudProvider, acc.providerVersion); + const provider = this.cloudProviderRegistryProvider.getProvider(acc.cloudProvider, acc.skin); return !isExcludedStageType(type, provider); }); }); @@ -139,7 +139,7 @@ export class PipelineConfigProvider implements IServiceProvider { configurableStageTypes.forEach(type => type.cloudProviders = this.getCloudProvidersForStage(type, allStageTypes, accounts)); configurableStageTypes = configurableStageTypes.filter(type => { return !accounts.every(a => { - const p = this.cloudProviderRegistryProvider.getProvider(a.cloudProvider, a.providerVersion); + const p = this.cloudProviderRegistryProvider.getProvider(a.cloudProvider, a.skin); return isExcludedStageType(type, p); }); }); diff --git a/app/scripts/modules/core/src/reactShims/react.injector.ts b/app/scripts/modules/core/src/reactShims/react.injector.ts index eb54bca24de..b52e6de4e66 100644 --- a/app/scripts/modules/core/src/reactShims/react.injector.ts +++ b/app/scripts/modules/core/src/reactShims/react.injector.ts @@ -60,8 +60,8 @@ import { TaskReader } from '../task/task.read.service'; import { UrlBuilderService } from 'core/navigation/urlBuilder.service'; import { VariableInputService } from '../pipeline/config/templates/inputs/variableInput.service'; import { VariableValidatorService } from '../pipeline/config/templates/validators/variableValidator.service'; -import { VersionSelectionService } from '../cloudProvider/versionSelection/versionSelection.service'; -import { VersionedCloudProviderService } from '../cloudProvider/versionedCloudProvider.service'; +import { SkinSelectionService } from '../cloudProvider/skinSelection/skinSelection.service'; +import { SkinService } from '../cloudProvider/skin.service'; import { ViewStateCacheService } from '../cache/viewStateCache.service'; import { WaypointService } from '../utils/waypoints/waypoint.service'; @@ -147,8 +147,8 @@ export class CoreReactInject extends ReactInject { public get urlBuilderService() { return this.$injector.get('urlBuilderService') as UrlBuilderService; } public get variableInputService() { return this.$injector.get('variableInputService') as VariableInputService; } public get variableValidatorService() { return this.$injector.get('variableValidatorService') as VariableValidatorService; } - public get versionSelectionService() { return this.$injector.get('versionSelectionService') as VersionSelectionService; } - public get versionedCloudProviderService() { return this.$injector.get('versionedCloudProviderService') as VersionedCloudProviderService; } + public get skinSelectionService() { return this.$injector.get('skinSelectionService') as SkinSelectionService; } + public get skinService() { return this.$injector.get('skinService') as SkinService; } public get viewStateCache() { return this.$injector.get('viewStateCache') as ViewStateCacheService; } public get waypointService() { return this.$injector.get('waypointService') as WaypointService; } diff --git a/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js b/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js index d32710896a8..33a5a5d26c2 100644 --- a/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js +++ b/app/scripts/modules/core/src/securityGroup/AllSecurityGroupsCtrl.js @@ -3,7 +3,7 @@ import _ from 'lodash'; import { CLOUD_PROVIDER_REGISTRY } from 'core/cloudProvider/cloudProvider.registry'; -import { VERSION_SELECTION_SERVICE } from 'core/cloudProvider/versionSelection/versionSelection.service'; +import { SKIN_SELECTION_SERVICE } from 'core/cloudProvider/skinSelection/skinSelection.service'; import { PROVIDER_SELECTION_SERVICE } from 'core/cloudProvider/providerSelection/providerSelection.service'; import { SETTINGS } from 'core/config/settings'; import { SECURITY_GROUP_FILTER_MODEL } from './filter/securityGroupFilter.model'; @@ -15,11 +15,11 @@ module.exports = angular.module('spinnaker.core.securityGroup.all.controller', [ SECURITY_GROUP_FILTER_SERVICE, SECURITY_GROUP_FILTER_MODEL, PROVIDER_SELECTION_SERVICE, - VERSION_SELECTION_SERVICE, + SKIN_SELECTION_SERVICE, require('angular-ui-bootstrap'), CLOUD_PROVIDER_REGISTRY, ]) - .controller('AllSecurityGroupsCtrl', function($scope, app, $uibModal, $timeout, versionSelectionService, + .controller('AllSecurityGroupsCtrl', function($scope, app, $uibModal, $timeout, skinSelectionService, providerSelectionService, cloudProviderRegistry, securityGroupFilterModel, securityGroupFilterService) { @@ -69,7 +69,7 @@ module.exports = angular.module('spinnaker.core.securityGroup.all.controller', [ this.createSecurityGroup = function createSecurityGroup() { providerSelectionService.selectProvider(app, 'securityGroup').then((selectedProvider) => { - versionSelectionService.selectVersion(selectedProvider).then((selectedVersion) => { + skinSelectionService.selectSkin(selectedProvider).then((selectedVersion) => { let provider = cloudProviderRegistry.getValue(selectedProvider, 'securityGroup', selectedVersion); var defaultCredentials = app.defaultCredentials[selectedProvider] || SETTINGS.providers[selectedProvider].defaults.account, defaultRegion = app.defaultRegions[selectedProvider] || SETTINGS.providers[selectedProvider].defaults.region; diff --git a/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts b/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts index 96198713e0c..605c4ac6a48 100644 --- a/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts +++ b/app/scripts/modules/core/src/securityGroup/securityGroup.states.ts @@ -5,7 +5,7 @@ import { INestedState, STATE_CONFIG_PROVIDER, StateConfigProvider } from 'core/n import { APPLICATION_STATE_PROVIDER, ApplicationStateProvider, Application, APPLICATION_MODEL_BUILDER, ApplicationModelBuilder } from 'core/application'; -import { VERSIONED_CLOUD_PROVIDER_SERVICE, VersionedCloudProviderService } from 'core/cloudProvider'; +import { SKIN_SERVICE, SkinService } from 'core/cloudProvider'; import { SecurityGroupReader } from './securityGroupReader.service'; import { filterModelConfig } from './filter/securityGroupFilter.model'; @@ -16,7 +16,7 @@ module(SECURITY_GROUP_STATES, [ APPLICATION_STATE_PROVIDER, STATE_CONFIG_PROVIDER, APPLICATION_MODEL_BUILDER, - VERSIONED_CLOUD_PROVIDER_SERVICE, + SKIN_SERVICE, ]).config((applicationStateProvider: ApplicationStateProvider, stateConfigProvider: StateConfigProvider) => { const securityGroupDetails: INestedState = { @@ -92,10 +92,10 @@ module(SECURITY_GROUP_STATES, [ views: { 'main@': { templateUrl: require('../presentation/standalone.view.html'), - controllerProvider: ['$stateParams', 'versionedCloudProviderService', + controllerProvider: ['$stateParams', 'skinService', ($stateParams: StateParams, - versionedCloudProviderService: VersionedCloudProviderService) => { - return versionedCloudProviderService.getValue($stateParams.provider, $stateParams.accountId, 'securityGroup.detailsController'); + skinService: SkinService) => { + return skinService.getValue($stateParams.provider, $stateParams.accountId, 'securityGroup.detailsController'); }], controllerAs: 'ctrl' } diff --git a/app/scripts/modules/core/src/serverGroup/details/ServerGroupDetailsWrapper.tsx b/app/scripts/modules/core/src/serverGroup/details/ServerGroupDetailsWrapper.tsx index 5423b558d52..971ebf904e3 100644 --- a/app/scripts/modules/core/src/serverGroup/details/ServerGroupDetailsWrapper.tsx +++ b/app/scripts/modules/core/src/serverGroup/details/ServerGroupDetailsWrapper.tsx @@ -76,13 +76,13 @@ export class ServerGroupDetailsWrapper extends React.Component, DetailsGetter, diff --git a/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js index ccd5189391c..938776c08eb 100644 --- a/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js +++ b/app/scripts/modules/core/src/serverGroup/serverGroup.transformer.js @@ -16,20 +16,20 @@ module.exports = angular.module('spinnaker.core.serverGroup.transformer', [ return accountService.getAccountDetails(account) .then((accountDetails) => { // If there is a versioned cloud provider, and the user does not have permission to view the account itself, it will - // fail to get the accountDetails and thus fail to get the appropriate providerVersion. - return normalizeServerGroupForProviderVersion(serverGroup, application, accountDetails && accountDetails.providerVersion); + // fail to get the accountDetails and thus fail to get the appropriate skin. + return normalizeServerGroupForSkin(serverGroup, application, accountDetails && accountDetails.skin); }); } else { - return $q.resolve(normalizeServerGroupForProviderVersion(serverGroup, application)); + return $q.resolve(normalizeServerGroupForSkin(serverGroup, application)); } } - function normalizeServerGroupForProviderVersion(serverGroup, application, providerVersion) { - if (!providerServiceDelegate.hasDelegate(serverGroup.provider || serverGroup.type, 'serverGroup.transformer', providerVersion)) { + function normalizeServerGroupForSkin(serverGroup, application, skin) { + if (!providerServiceDelegate.hasDelegate(serverGroup.provider || serverGroup.type, 'serverGroup.transformer', skin)) { return null; } return providerServiceDelegate - .getDelegate(serverGroup.provider || serverGroup.type, 'serverGroup.transformer', providerVersion) + .getDelegate(serverGroup.provider || serverGroup.type, 'serverGroup.transformer', skin) .normalizeServerGroup(serverGroup, application); } diff --git a/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts b/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts index a3c206fd47c..d568caaccb9 100644 --- a/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts +++ b/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts @@ -58,8 +58,8 @@ module(KUBERNETES_V1_MODULE, [ .config((cloudProviderRegistryProvider: CloudProviderRegistry) => { cloudProviderRegistryProvider.registerProvider('kubernetes', { name: 'Kubernetes', - providerVersion: 'v1', - defaultVersion: true, + skin: 'v1', + defaultSkin: true, cache: { configurer: 'kubernetesCacheConfigurer', }, diff --git a/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts b/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts index 9fd2b62c18c..886fd132571 100644 --- a/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts +++ b/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts @@ -85,7 +85,7 @@ module(KUBERNETES_V2_MODULE, [ ]).config((cloudProviderRegistryProvider: CloudProviderRegistry) => { cloudProviderRegistryProvider.registerProvider('kubernetes', { name: 'Kubernetes', - providerVersion: 'v2', + skin: 'v2', logo: { path: require('../logo/kubernetes.icon.svg'), },