diff --git a/app/scripts/app.ts b/app/scripts/app.ts index 4f4b9c73147..7ce4d5917ae 100644 --- a/app/scripts/app.ts +++ b/app/scripts/app.ts @@ -2,13 +2,14 @@ import { module } from 'angular'; import { CORE_MODULE } from '@spinnaker/core'; import { DOCKER_MODULE } from '@spinnaker/docker'; +import { AMAZON_MODULE } from '@spinnaker/amazon'; import { APPENGINE_MODULE } from './modules/appengine/appengine.module'; import { NETFLIX_MODULE } from './modules/netflix/netflix.module'; module('netflix.spinnaker', [ NETFLIX_MODULE, CORE_MODULE, - require('./modules/amazon/aws.module.js'), + AMAZON_MODULE, require('./modules/google/gce.module.js'), require('./modules/cloudfoundry/cf.module.js'), require('./modules/titus/titus.module.js'), diff --git a/app/scripts/modules/amazon/aws.module.js b/app/scripts/modules/amazon/aws.module.js deleted file mode 100644 index 3f613c2a56b..00000000000 --- a/app/scripts/modules/amazon/aws.module.js +++ /dev/null @@ -1,109 +0,0 @@ -'use strict'; - -const angular = require('angular'); - -import { CLOUD_PROVIDER_REGISTRY } from '@spinnaker/core'; - -import { AMAZON_APPLICATION_NAME_VALIDATOR } from './validation/applicationName.validator'; - -import { AMAZON_HELP } from './help/amazon.help'; - -import './logo/aws.logo.less'; - -// load all templates into the $templateCache -var templates = require.context('./', true, /\.html$/); -templates.keys().forEach(function(key) { - templates(key); -}); - -module.exports = angular.module('spinnaker.aws', [ - CLOUD_PROVIDER_REGISTRY, - AMAZON_HELP, - require('./pipeline/stages/bake/awsBakeStage.js'), - require('./pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js'), - require('./pipeline/stages/destroyAsg/awsDestroyAsgStage.js'), - require('./pipeline/stages/disableAsg/awsDisableAsgStage.js'), - require('./pipeline/stages/disableCluster/awsDisableClusterStage.js'), - require('./pipeline/stages/enableAsg/awsEnableAsgStage.js'), - require('./pipeline/stages/findAmi/awsFindAmiStage.js'), - require('./pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js'), - require('./pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js'), - require('./pipeline/stages/resizeAsg/awsResizeAsgStage.js'), - require('./pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js'), - require('./pipeline/stages/shrinkCluster/awsShrinkClusterStage.js'), - require('./pipeline/stages/tagImage/awsTagImageStage.js'), - require('./serverGroup/details/serverGroup.details.module.js'), - require('./serverGroup/serverGroup.transformer.js'), - require('./serverGroup/configure/wizard/CloneServerGroup.aws.controller.js'), - require('./serverGroup/configure/serverGroup.configure.aws.module.js'), - require('./instance/awsInstanceType.service.js'), - require('./loadBalancer/loadBalancer.transformer.js'), - require('./loadBalancer/details/loadBalancerDetail.controller.js'), - require('./loadBalancer/configure/createLoadBalancer.controller.js'), - require('./instance/details/instance.details.controller.js'), - require('./securityGroup/details/securityGroupDetail.controller.js'), - require('./securityGroup/configure/CreateSecurityGroupCtrl.js'), - require('./securityGroup/configure/EditSecurityGroupCtrl.js'), - require('./securityGroup/securityGroup.transformer.js'), - require('./securityGroup/securityGroup.reader.js'), - require('./subnet/subnet.renderer.js'), - AMAZON_APPLICATION_NAME_VALIDATOR, - require('./vpc/vpc.module.js'), - require('./image/image.reader.js'), - require('./cache/cacheConfigurer.service.js'), - require('./search/searchResultFormatter.js'), -]) - .config(function(cloudProviderRegistryProvider) { - cloudProviderRegistryProvider.registerProvider('aws', { - name: 'Amazon', - logo: { - path: require('./logo/amazon.logo.svg'), - }, - cache: { - configurer: 'awsCacheConfigurer', - }, - image: { - reader: 'awsImageReader', - }, - serverGroup: { - transformer: 'awsServerGroupTransformer', - detailsTemplateUrl: require('./serverGroup/details/serverGroupDetails.html'), - detailsController: 'awsServerGroupDetailsCtrl', - cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/serverGroupWizard.html'), - cloneServerGroupController: 'awsCloneServerGroupCtrl', - commandBuilder: 'awsServerGroupCommandBuilder', - configurationService: 'awsServerGroupConfigurationService', - scalingActivitiesEnabled: true, - }, - instance: { - instanceTypeService: 'awsInstanceTypeService', - detailsTemplateUrl: require('./instance/details/instanceDetails.html'), - detailsController: 'awsInstanceDetailsCtrl', - }, - loadBalancer: { - transformer: 'awsLoadBalancerTransformer', - detailsTemplateUrl: require('./loadBalancer/details/loadBalancerDetail.html'), - detailsController: 'awsLoadBalancerDetailsCtrl', - createLoadBalancerTemplateUrl: require('./loadBalancer/configure/createLoadBalancer.html'), - createLoadBalancerController: 'awsCreateLoadBalancerCtrl', - editLoadBalancerTemplateUrl: require('./loadBalancer/configure/editLoadBalancer.html'), - }, - securityGroup: { - transformer: 'awsSecurityGroupTransformer', - reader: 'awsSecurityGroupReader', - detailsTemplateUrl: require('./securityGroup/details/securityGroupDetail.html'), - detailsController: 'awsSecurityGroupDetailsCtrl', - createSecurityGroupTemplateUrl: require('./securityGroup/configure/createSecurityGroup.html'), - createSecurityGroupController: 'awsCreateSecurityGroupCtrl', - }, - subnet: { - renderer: 'awsSubnetRenderer', - }, - search: { - resultFormatter: 'awsSearchResultFormatter', - }, - applicationProviderFields:{ - templateUrl: require('./applicationProviderFields/awsFields.html'), - }, - }); - }); diff --git a/app/scripts/modules/amazon/applicationProviderFields/awsFields.html b/app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html similarity index 100% rename from app/scripts/modules/amazon/applicationProviderFields/awsFields.html rename to app/scripts/modules/amazon/src/applicationProviderFields/awsFields.html diff --git a/app/scripts/modules/amazon/src/aws.module.ts b/app/scripts/modules/amazon/src/aws.module.ts new file mode 100644 index 00000000000..0cf699804f6 --- /dev/null +++ b/app/scripts/modules/amazon/src/aws.module.ts @@ -0,0 +1,102 @@ +import { module } from 'angular'; + +import { CLOUD_PROVIDER_REGISTRY } from '@spinnaker/core'; + +import { AMAZON_APPLICATION_NAME_VALIDATOR } from './validation/applicationName.validator'; + +import { AMAZON_HELP } from './help/amazon.help'; + +import './logo/aws.logo.less'; +import { CloudProviderRegistry } from 'core/cloudProvider'; + +export const AMAZON_MODULE = 'spinnaker.amazon'; +module(AMAZON_MODULE, [ + CLOUD_PROVIDER_REGISTRY, + AMAZON_HELP, + AMAZON_APPLICATION_NAME_VALIDATOR, + require('./pipeline/stages/bake/awsBakeStage'), + require('./pipeline/stages/cloneServerGroup/awsCloneServerGroupStage'), + require('./pipeline/stages/destroyAsg/awsDestroyAsgStage'), + require('./pipeline/stages/disableAsg/awsDisableAsgStage'), + require('./pipeline/stages/disableCluster/awsDisableClusterStage'), + require('./pipeline/stages/enableAsg/awsEnableAsgStage'), + require('./pipeline/stages/findAmi/awsFindAmiStage'), + require('./pipeline/stages/findImageFromTags/awsFindImageFromTagsStage'), + require('./pipeline/stages/modifyScalingProcess/modifyScalingProcessStage'), + require('./pipeline/stages/resizeAsg/awsResizeAsgStage'), + require('./pipeline/stages/scaleDownCluster/awsScaleDownClusterStage'), + require('./pipeline/stages/shrinkCluster/awsShrinkClusterStage'), + require('./pipeline/stages/tagImage/awsTagImageStage'), + require('./serverGroup/details/serverGroup.details.module'), + require('./serverGroup/serverGroup.transformer'), + require('./serverGroup/configure/wizard/CloneServerGroup.aws.controller'), + require('./serverGroup/configure/serverGroup.configure.aws.module'), + require('./instance/awsInstanceType.service'), + require('./loadBalancer/loadBalancer.transformer'), + require('./loadBalancer/details/loadBalancerDetail.controller'), + require('./loadBalancer/configure/createLoadBalancer.controller'), + require('./instance/details/instance.details.controller'), + require('./securityGroup/details/securityGroupDetail.controller'), + require('./securityGroup/configure/CreateSecurityGroupCtrl'), + require('./securityGroup/configure/EditSecurityGroupCtrl'), + require('./securityGroup/securityGroup.transformer'), + require('./securityGroup/securityGroup.reader'), + require('./subnet/subnet.renderer'), + require('./vpc/vpc.module'), + require('./image/image.reader'), + require('./cache/cacheConfigurer.service'), + require('./search/searchResultFormatter'), +]).config((cloudProviderRegistryProvider: CloudProviderRegistry) => { + cloudProviderRegistryProvider.registerProvider('aws', { + name: 'Amazon', + logo: { + path: require('./logo/amazon.logo.svg'), + }, + cache: { + configurer: 'awsCacheConfigurer', + }, + image: { + reader: 'awsImageReader', + }, + serverGroup: { + transformer: 'awsServerGroupTransformer', + detailsTemplateUrl: require('./serverGroup/details/serverGroupDetails.html'), + detailsController: 'awsServerGroupDetailsCtrl', + cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/serverGroupWizard.html'), + cloneServerGroupController: 'awsCloneServerGroupCtrl', + commandBuilder: 'awsServerGroupCommandBuilder', + configurationService: 'awsServerGroupConfigurationService', + scalingActivitiesEnabled: true, + }, + instance: { + instanceTypeService: 'awsInstanceTypeService', + detailsTemplateUrl: require('./instance/details/instanceDetails.html'), + detailsController: 'awsInstanceDetailsCtrl', + }, + loadBalancer: { + transformer: 'awsLoadBalancerTransformer', + detailsTemplateUrl: require('./loadBalancer/details/loadBalancerDetail.html'), + detailsController: 'awsLoadBalancerDetailsCtrl', + createLoadBalancerTemplateUrl: require('./loadBalancer/configure/createLoadBalancer.html'), + createLoadBalancerController: 'awsCreateLoadBalancerCtrl', + editLoadBalancerTemplateUrl: require('./loadBalancer/configure/editLoadBalancer.html'), + }, + securityGroup: { + transformer: 'awsSecurityGroupTransformer', + reader: 'awsSecurityGroupReader', + detailsTemplateUrl: require('./securityGroup/details/securityGroupDetail.html'), + detailsController: 'awsSecurityGroupDetailsCtrl', + createSecurityGroupTemplateUrl: require('./securityGroup/configure/createSecurityGroup.html'), + createSecurityGroupController: 'awsCreateSecurityGroupCtrl', + }, + subnet: { + renderer: 'awsSubnetRenderer', + }, + search: { + resultFormatter: 'awsSearchResultFormatter', + }, + applicationProviderFields: { + templateUrl: require('./applicationProviderFields/awsFields.html'), + }, + }); +}); diff --git a/app/scripts/modules/amazon/aws.settings.ts b/app/scripts/modules/amazon/src/aws.settings.ts similarity index 100% rename from app/scripts/modules/amazon/aws.settings.ts rename to app/scripts/modules/amazon/src/aws.settings.ts diff --git a/app/scripts/modules/amazon/cache/cacheConfigurer.service.js b/app/scripts/modules/amazon/src/cache/cacheConfigurer.service.js similarity index 100% rename from app/scripts/modules/amazon/cache/cacheConfigurer.service.js rename to app/scripts/modules/amazon/src/cache/cacheConfigurer.service.js diff --git a/app/scripts/modules/amazon/common/footer.directive.html b/app/scripts/modules/amazon/src/common/footer.directive.html similarity index 100% rename from app/scripts/modules/amazon/common/footer.directive.html rename to app/scripts/modules/amazon/src/common/footer.directive.html diff --git a/app/scripts/modules/amazon/common/footer.directive.js b/app/scripts/modules/amazon/src/common/footer.directive.js similarity index 100% rename from app/scripts/modules/amazon/common/footer.directive.js rename to app/scripts/modules/amazon/src/common/footer.directive.js diff --git a/app/scripts/modules/amazon/domain/IKeyPair.ts b/app/scripts/modules/amazon/src/domain/IKeyPair.ts similarity index 100% rename from app/scripts/modules/amazon/domain/IKeyPair.ts rename to app/scripts/modules/amazon/src/domain/IKeyPair.ts diff --git a/app/scripts/modules/amazon/domain/index.ts b/app/scripts/modules/amazon/src/domain/index.ts similarity index 100% rename from app/scripts/modules/amazon/domain/index.ts rename to app/scripts/modules/amazon/src/domain/index.ts diff --git a/app/scripts/modules/amazon/help/amazon.help.ts b/app/scripts/modules/amazon/src/help/amazon.help.ts similarity index 100% rename from app/scripts/modules/amazon/help/amazon.help.ts rename to app/scripts/modules/amazon/src/help/amazon.help.ts diff --git a/app/scripts/modules/amazon/image/image.reader.js b/app/scripts/modules/amazon/src/image/image.reader.js similarity index 100% rename from app/scripts/modules/amazon/image/image.reader.js rename to app/scripts/modules/amazon/src/image/image.reader.js diff --git a/app/scripts/modules/amazon/image/image.reader.spec.js b/app/scripts/modules/amazon/src/image/image.reader.spec.js similarity index 100% rename from app/scripts/modules/amazon/image/image.reader.spec.js rename to app/scripts/modules/amazon/src/image/image.reader.spec.js diff --git a/app/scripts/modules/amazon/index.ts b/app/scripts/modules/amazon/src/index.ts similarity index 62% rename from app/scripts/modules/amazon/index.ts rename to app/scripts/modules/amazon/src/index.ts index 6741075326c..757510a2c9d 100644 --- a/app/scripts/modules/amazon/index.ts +++ b/app/scripts/modules/amazon/src/index.ts @@ -1,3 +1,5 @@ +export { AMAZON_MODULE } from './aws.module'; + export * from './domain'; export * from './keyPairs'; diff --git a/app/scripts/modules/amazon/instance/awsInstanceType.service.js b/app/scripts/modules/amazon/src/instance/awsInstanceType.service.js similarity index 100% rename from app/scripts/modules/amazon/instance/awsInstanceType.service.js rename to app/scripts/modules/amazon/src/instance/awsInstanceType.service.js diff --git a/app/scripts/modules/amazon/instance/awsInstanceType.service.spec.js b/app/scripts/modules/amazon/src/instance/awsInstanceType.service.spec.js similarity index 100% rename from app/scripts/modules/amazon/instance/awsInstanceType.service.spec.js rename to app/scripts/modules/amazon/src/instance/awsInstanceType.service.spec.js diff --git a/app/scripts/modules/amazon/instance/details/instance.details.controller.js b/app/scripts/modules/amazon/src/instance/details/instance.details.controller.js similarity index 100% rename from app/scripts/modules/amazon/instance/details/instance.details.controller.js rename to app/scripts/modules/amazon/src/instance/details/instance.details.controller.js diff --git a/app/scripts/modules/amazon/instance/details/instance.details.controller.spec.js b/app/scripts/modules/amazon/src/instance/details/instance.details.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/instance/details/instance.details.controller.spec.js rename to app/scripts/modules/amazon/src/instance/details/instance.details.controller.spec.js diff --git a/app/scripts/modules/amazon/instance/details/instanceDetails.html b/app/scripts/modules/amazon/src/instance/details/instanceDetails.html similarity index 100% rename from app/scripts/modules/amazon/instance/details/instanceDetails.html rename to app/scripts/modules/amazon/src/instance/details/instanceDetails.html diff --git a/app/scripts/modules/amazon/keyPairs/index.ts b/app/scripts/modules/amazon/src/keyPairs/index.ts similarity index 100% rename from app/scripts/modules/amazon/keyPairs/index.ts rename to app/scripts/modules/amazon/src/keyPairs/index.ts diff --git a/app/scripts/modules/amazon/keyPairs/keyPairs.read.service.ts b/app/scripts/modules/amazon/src/keyPairs/keyPairs.read.service.ts similarity index 100% rename from app/scripts/modules/amazon/keyPairs/keyPairs.read.service.ts rename to app/scripts/modules/amazon/src/keyPairs/keyPairs.read.service.ts diff --git a/app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html b/app/scripts/modules/amazon/src/loadBalancer/configure/advancedSettings.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/advancedSettings.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/advancedSettings.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js b/app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.controller.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.js rename to app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.controller.js diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.spec.js b/app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.controller.spec.js rename to app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.controller.spec.js diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html b/app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancer.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancer.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html b/app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancerProperties.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/createLoadBalancerProperties.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/createLoadBalancerProperties.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html b/app/scripts/modules/amazon/src/loadBalancer/configure/editLoadBalancer.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/editLoadBalancer.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/editLoadBalancer.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html b/app/scripts/modules/amazon/src/loadBalancer/configure/healthCheck.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/healthCheck.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/healthCheck.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/listeners.html b/app/scripts/modules/amazon/src/loadBalancer/configure/listeners.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/listeners.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/listeners.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html b/app/scripts/modules/amazon/src/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.html diff --git a/app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.js b/app/scripts/modules/amazon/src/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.js rename to app/scripts/modules/amazon/src/loadBalancer/configure/loadBalancerAvailabilityZoneSelector.directive.js diff --git a/app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html b/app/scripts/modules/amazon/src/loadBalancer/configure/securityGroups.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/configure/securityGroups.html rename to app/scripts/modules/amazon/src/loadBalancer/configure/securityGroups.html diff --git a/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.controller.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.js rename to app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.controller.js diff --git a/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.spec.js b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.controller.spec.js rename to app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.controller.spec.js diff --git a/app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.html b/app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.html similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/details/loadBalancerDetail.html rename to app/scripts/modules/amazon/src/loadBalancer/details/loadBalancerDetail.html diff --git a/app/scripts/modules/amazon/loadBalancer/loadBalancer.transformer.js b/app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.js similarity index 100% rename from app/scripts/modules/amazon/loadBalancer/loadBalancer.transformer.js rename to app/scripts/modules/amazon/src/loadBalancer/loadBalancer.transformer.js diff --git a/app/scripts/modules/amazon/logo/amazon.logo.svg b/app/scripts/modules/amazon/src/logo/amazon.logo.svg similarity index 100% rename from app/scripts/modules/amazon/logo/amazon.logo.svg rename to app/scripts/modules/amazon/src/logo/amazon.logo.svg diff --git a/app/scripts/modules/amazon/logo/aws.icon.svg b/app/scripts/modules/amazon/src/logo/aws.icon.svg similarity index 100% rename from app/scripts/modules/amazon/logo/aws.icon.svg rename to app/scripts/modules/amazon/src/logo/aws.icon.svg diff --git a/app/scripts/modules/amazon/logo/aws.logo.less b/app/scripts/modules/amazon/src/logo/aws.logo.less similarity index 100% rename from app/scripts/modules/amazon/logo/aws.logo.less rename to app/scripts/modules/amazon/src/logo/aws.logo.less diff --git a/app/scripts/modules/amazon/pipeline/stages/bake/awsBakeStage.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/bake/awsBakeStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/bake/bakeExecutionDetails.controller.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/bake/bakeExecutionDetails.controller.js rename to app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.controller.js diff --git a/app/scripts/modules/amazon/pipeline/stages/bake/bakeExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/bake/bakeExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/bake/bakeExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/bake/bakeStage.html b/app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/bake/bakeStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/bake/bakeStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/awsCloneServerGroupStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js rename to app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.controller.js diff --git a/app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html rename to app/scripts/modules/amazon/src/pipeline/stages/cloneServerGroup/cloneServerGroupStepLabel.html diff --git a/app/scripts/modules/amazon/pipeline/stages/destroyAsg/awsDestroyAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/awsDestroyAsgStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/destroyAsg/awsDestroyAsgStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/awsDestroyAsgStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/destroyAsg/destroyAsgStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/destroyAsg/destroyAsgStepLabel.html rename to app/scripts/modules/amazon/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html diff --git a/app/scripts/modules/amazon/pipeline/stages/disableAsg/awsDisableAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/awsDisableAsgStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableAsg/awsDisableAsgStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/disableAsg/awsDisableAsgStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableAsg/disableAsgStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableAsg/disableAsgStepLabel.html rename to app/scripts/modules/amazon/src/pipeline/stages/disableAsg/disableAsgStepLabel.html diff --git a/app/scripts/modules/amazon/pipeline/stages/disableCluster/awsDisableClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/awsDisableClusterStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableCluster/awsDisableClusterStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/disableCluster/awsDisableClusterStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/disableCluster/disableClusterExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableCluster/disableClusterExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/disableCluster/disableClusterStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/disableCluster/disableClusterStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/enableAsg/awsEnableAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/awsEnableAsgStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/enableAsg/awsEnableAsgStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/enableAsg/awsEnableAsgStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/enableAsg/enableAsgStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/enableAsg/enableAsgStepLabel.html rename to app/scripts/modules/amazon/src/pipeline/stages/enableAsg/enableAsgStepLabel.html diff --git a/app/scripts/modules/amazon/pipeline/stages/findAmi/awsFindAmiStage.js b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/awsFindAmiStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findAmi/awsFindAmiStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/findAmi/awsFindAmiStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/findAmi/findAmiExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findAmi/findAmiExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findAmi/findAmiStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/findAmi/findAmiStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/awsFindImageFromTagsStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/findImageFromTags/findImageFromTagsExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findImageFromTags/findImageFromTagsExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/findImageFromTags/findImageFromTagsStage.html b/app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/findImageFromTags/findImageFromTagsStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/findImageFromTags/findImageFromTagsStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js b/app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/modifyScalingProcess/modifyScalingProcessStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/resizeAsg/awsResizeAsgStage.js b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/resizeAsg/awsResizeAsgStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/awsResizeAsgStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgStage.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgStepLabel.html b/app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/resizeAsg/resizeAsgStepLabel.html rename to app/scripts/modules/amazon/src/pipeline/stages/resizeAsg/resizeAsgStepLabel.html diff --git a/app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/awsScaleDownClusterStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/awsShrinkClusterStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/shrinkCluster/shrinkClusterStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html diff --git a/app/scripts/modules/amazon/pipeline/stages/tagImage/awsTagImageStage.js b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/awsTagImageStage.js similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/tagImage/awsTagImageStage.js rename to app/scripts/modules/amazon/src/pipeline/stages/tagImage/awsTagImageStage.js diff --git a/app/scripts/modules/amazon/pipeline/stages/tagImage/tagImageExecutionDetails.html b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/tagImage/tagImageExecutionDetails.html rename to app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageExecutionDetails.html diff --git a/app/scripts/modules/amazon/pipeline/stages/tagImage/tagImageStage.html b/app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageStage.html similarity index 100% rename from app/scripts/modules/amazon/pipeline/stages/tagImage/tagImageStage.html rename to app/scripts/modules/amazon/src/pipeline/stages/tagImage/tagImageStage.html diff --git a/app/scripts/modules/amazon/search/searchResultFormatter.js b/app/scripts/modules/amazon/src/search/searchResultFormatter.js similarity index 100% rename from app/scripts/modules/amazon/search/searchResultFormatter.js rename to app/scripts/modules/amazon/src/search/searchResultFormatter.js diff --git a/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.controller.js b/app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.controller.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.controller.js rename to app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.controller.js diff --git a/app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/clone/cloneSecurityGroup.html rename to app/scripts/modules/amazon/src/securityGroup/clone/cloneSecurityGroup.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js b/app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroup.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroup.controller.spec.js rename to app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroup.controller.spec.js diff --git a/app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroupCtrl.js b/app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroupCtrl.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/CreateSecurityGroupCtrl.js rename to app/scripts/modules/amazon/src/securityGroup/configure/CreateSecurityGroupCtrl.js diff --git a/app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js b/app/scripts/modules/amazon/src/securityGroup/configure/EditSecurityGroupCtrl.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/EditSecurityGroupCtrl.js rename to app/scripts/modules/amazon/src/securityGroup/configure/EditSecurityGroupCtrl.js diff --git a/app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js b/app/scripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/configSecurityGroup.mixin.controller.js rename to app/scripts/modules/amazon/src/securityGroup/configure/configSecurityGroup.mixin.controller.js diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/createSecurityGroup.html rename to app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroup.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroupIngress.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupIngress.html rename to app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroupIngress.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html b/app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroupProperties.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/createSecurityGroupProperties.html rename to app/scripts/modules/amazon/src/securityGroup/configure/createSecurityGroupProperties.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html b/app/scripts/modules/amazon/src/securityGroup/configure/editSecurityGroup.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/editSecurityGroup.html rename to app/scripts/modules/amazon/src/securityGroup/configure/editSecurityGroup.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.html b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.html rename to app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.html diff --git a/app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.js b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.js rename to app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.js diff --git a/app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.less b/app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.less similarity index 100% rename from app/scripts/modules/amazon/securityGroup/configure/ingressRuleGroupSelector.component.less rename to app/scripts/modules/amazon/src/securityGroup/configure/ingressRuleGroupSelector.component.less diff --git a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.controller.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.controller.js rename to app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.controller.js diff --git a/app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.html b/app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html similarity index 100% rename from app/scripts/modules/amazon/securityGroup/details/securityGroupDetail.html rename to app/scripts/modules/amazon/src/securityGroup/details/securityGroupDetail.html diff --git a/app/scripts/modules/amazon/securityGroup/securityGroup.reader.js b/app/scripts/modules/amazon/src/securityGroup/securityGroup.reader.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/securityGroup.reader.js rename to app/scripts/modules/amazon/src/securityGroup/securityGroup.reader.js diff --git a/app/scripts/modules/amazon/securityGroup/securityGroup.transformer.js b/app/scripts/modules/amazon/src/securityGroup/securityGroup.transformer.js similarity index 100% rename from app/scripts/modules/amazon/securityGroup/securityGroup.transformer.js rename to app/scripts/modules/amazon/src/securityGroup/securityGroup.transformer.js diff --git a/test/fixture/AccountServiceFixtures.js b/app/scripts/modules/amazon/src/serverGroup/configure/AccountServiceFixtures.js similarity index 100% rename from test/fixture/AccountServiceFixtures.js rename to app/scripts/modules/amazon/src/serverGroup/configure/AccountServiceFixtures.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroup.configure.aws.module.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroup.configure.aws.module.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroup.configure.aws.module.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.aws.service.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.aws.service.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.aws.service.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.aws.service.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.service.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.service.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.service.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.spec.js similarity index 96% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.spec.js index fb5e265970b..406dbdbc9c6 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.spec.js +++ b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupCommandBuilder.spec.js @@ -1,9 +1,9 @@ 'use strict'; -import {AWSProviderSettings} from '../../aws.settings'; +import {AWSProviderSettings} from 'amazon/aws.settings'; describe('awsServerGroupCommandBuilder', function() { - const AccountServiceFixture = require('../../../../../../test/fixture/AccountServiceFixtures'); + const AccountServiceFixture = require('./AccountServiceFixtures'); beforeEach( window.module( diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/serverGroupConfiguration.service.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/serverGroupConfiguration.service.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/CloneServerGroup.aws.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js similarity index 98% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js index edd99696882..3045342c99f 100644 --- a/app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js +++ b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js @@ -6,8 +6,8 @@ existence. */ describe('Controller: awsCloneServerGroup', function () { - const AccountServiceFixture = require('../../../../../../../test/fixture/AccountServiceFixtures.js'); - const securityGroupReaderFixture = require('../../../../../../../test/fixture/SecurityGroupServiceFixtures.js'); + const AccountServiceFixture = require('../AccountServiceFixtures.js'); + const securityGroupReaderFixture = require('./SecurityGroupServiceFixtures.js'); beforeEach( window.module( diff --git a/test/fixture/SecurityGroupServiceFixtures.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/SecurityGroupServiceFixtures.js similarity index 100% rename from test/fixture/SecurityGroupServiceFixtures.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/SecurityGroupServiceFixtures.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.component.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/advancedSettings/advancedSettings.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacity.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacity.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacity.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.controller.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.controller.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.controller.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/capacitySelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/capacitySelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/targetHealthyPercentageSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/zones.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/capacity/zones.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/capacity/zones.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/instanceType/instanceType.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/instanceType/instanceType.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/instanceType/instanceType.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancerSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/loadBalancers/loadBalancers.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/loadBalancers/loadBalancers.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/location/ServerGroupBasicSettings.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/location/basicSettings.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/location/basicSettings.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/location/basicSettings.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroups.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroups.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroups.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/securityGroups/securityGroupsRemoved.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/serverGroupWizard.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/serverGroupWizard.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/serverGroupWizard.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/deployInitializer.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/deployInitializerCtrl.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/templateSelection.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/templateSelection/templateSelection.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/templateSelection/templateSelection.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/availabilityZoneSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js b/app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js rename to app/scripts/modules/amazon/src/serverGroup/configure/wizard/zones/azRebalanceSelector.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html rename to app/scripts/modules/amazon/src/serverGroup/details/advancedSettings/editAsgAdvancedSettings.modal.html diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeCapacity.directive.html b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/resize/resizeCapacity.directive.html rename to app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeCapacity.directive.js b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/resize/resizeCapacity.directive.js rename to app/scripts/modules/amazon/src/serverGroup/details/resize/resizeCapacity.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.controller.spec.js b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.controller.spec.js rename to app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.controller.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.html b/app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/resize/resizeServerGroup.html rename to app/scripts/modules/amazon/src/serverGroup/details/resize/resizeServerGroup.html diff --git a/app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.html b/app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/rollback/rollbackServerGroup.html rename to app/scripts/modules/amazon/src/serverGroup/details/rollback/rollbackServerGroup.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/addScalingPolicyButton.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/addScalingPolicyButton.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/addScalingPolicyButton.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/addScalingPolicyButton.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/LineChartHack.css b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/LineChartHack.css similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/LineChartHack.css rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/LineChartHack.css diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.less b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.less similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.less rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.less diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.spec.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.spec.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/chart/metricAlarmChart.component.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyDetails.popover.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyDetails.popover.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyDetails.popover.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyDetails.popover.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/popover/scalingPolicyPopover.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicy.write.service.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicy.write.service.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicy.write.service.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicy.write.service.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.less b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.less similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/scalingPolicySummary.component.less rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/scalingPolicySummary.component.less diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.spec.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.spec.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/alarmConfigurer.component.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.less b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.less similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.less rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/alarm/dimensionsEditor.component.less diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/simple/simplePolicyAction.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.less b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.less similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.less rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/step/stepPolicyAction.component.less diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.less b/app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.less similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.less rename to app/scripts/modules/amazon/src/serverGroup/details/scalingPolicy/upsert/upsertScalingPolicy.modal.less diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/autoScalingProcess.service.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/autoScalingProcess.service.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingProcesses/autoScalingProcess.service.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/autoScalingProcess.service.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/autoScalingProcess.service.spec.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/autoScalingProcess.service.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingProcesses/autoScalingProcess.service.spec.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/autoScalingProcess.service.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.spec.js b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.spec.js rename to app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.controller.spec.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.html b/app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scalingProcesses/modifyScalingProcesses.html rename to app/scripts/modules/amazon/src/serverGroup/details/scalingProcesses/modifyScalingProcesses.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scheduledAction/editScheduledActions.modal.html rename to app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/editScheduledActions.modal.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scheduledAction/scheduledAction.directive.html b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/scheduledAction.directive.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scheduledAction/scheduledAction.directive.html rename to app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/scheduledAction.directive.html diff --git a/app/scripts/modules/amazon/serverGroup/details/scheduledAction/scheduledAction.directive.js b/app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/scheduledAction.directive.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/scheduledAction/scheduledAction.directive.js rename to app/scripts/modules/amazon/src/serverGroup/details/scheduledAction/scheduledAction.directive.js diff --git a/app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.html b/app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/securityGroup/editSecurityGroups.modal.html rename to app/scripts/modules/amazon/src/serverGroup/details/securityGroup/editSecurityGroups.modal.html diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroup.details.module.js b/app/scripts/modules/amazon/src/serverGroup/details/serverGroup.details.module.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/serverGroup.details.module.js rename to app/scripts/modules/amazon/src/serverGroup/details/serverGroup.details.module.js diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js b/app/scripts/modules/amazon/src/serverGroup/details/serverGroupDetails.aws.controller.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.aws.controller.js rename to app/scripts/modules/amazon/src/serverGroup/details/serverGroupDetails.aws.controller.js diff --git a/app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.html b/app/scripts/modules/amazon/src/serverGroup/details/serverGroupDetails.html similarity index 100% rename from app/scripts/modules/amazon/serverGroup/details/serverGroupDetails.html rename to app/scripts/modules/amazon/src/serverGroup/details/serverGroupDetails.html diff --git a/app/scripts/modules/amazon/serverGroup/serverGroup.transformer.js b/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/serverGroup.transformer.js rename to app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.js diff --git a/app/scripts/modules/amazon/serverGroup/serverGroup.transformer.spec.js b/app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.spec.js similarity index 100% rename from app/scripts/modules/amazon/serverGroup/serverGroup.transformer.spec.js rename to app/scripts/modules/amazon/src/serverGroup/serverGroup.transformer.spec.js diff --git a/app/scripts/modules/amazon/subnet/subnet.renderer.js b/app/scripts/modules/amazon/src/subnet/subnet.renderer.js similarity index 100% rename from app/scripts/modules/amazon/subnet/subnet.renderer.js rename to app/scripts/modules/amazon/src/subnet/subnet.renderer.js diff --git a/app/scripts/modules/amazon/subnet/subnetSelectField.component.html b/app/scripts/modules/amazon/src/subnet/subnetSelectField.component.html similarity index 100% rename from app/scripts/modules/amazon/subnet/subnetSelectField.component.html rename to app/scripts/modules/amazon/src/subnet/subnetSelectField.component.html diff --git a/app/scripts/modules/amazon/subnet/subnetSelectField.component.ts b/app/scripts/modules/amazon/src/subnet/subnetSelectField.component.ts similarity index 100% rename from app/scripts/modules/amazon/subnet/subnetSelectField.component.ts rename to app/scripts/modules/amazon/src/subnet/subnetSelectField.component.ts diff --git a/app/scripts/modules/amazon/validation/applicationName.validator.ts b/app/scripts/modules/amazon/src/validation/applicationName.validator.ts similarity index 100% rename from app/scripts/modules/amazon/validation/applicationName.validator.ts rename to app/scripts/modules/amazon/src/validation/applicationName.validator.ts diff --git a/app/scripts/modules/amazon/vpc/index.ts b/app/scripts/modules/amazon/src/vpc/index.ts similarity index 100% rename from app/scripts/modules/amazon/vpc/index.ts rename to app/scripts/modules/amazon/src/vpc/index.ts diff --git a/app/scripts/modules/amazon/vpc/vpc.module.js b/app/scripts/modules/amazon/src/vpc/vpc.module.js similarity index 100% rename from app/scripts/modules/amazon/vpc/vpc.module.js rename to app/scripts/modules/amazon/src/vpc/vpc.module.js diff --git a/app/scripts/modules/amazon/vpc/vpc.read.service.spec.js b/app/scripts/modules/amazon/src/vpc/vpc.read.service.spec.js similarity index 100% rename from app/scripts/modules/amazon/vpc/vpc.read.service.spec.js rename to app/scripts/modules/amazon/src/vpc/vpc.read.service.spec.js diff --git a/app/scripts/modules/amazon/vpc/vpc.read.service.ts b/app/scripts/modules/amazon/src/vpc/vpc.read.service.ts similarity index 100% rename from app/scripts/modules/amazon/vpc/vpc.read.service.ts rename to app/scripts/modules/amazon/src/vpc/vpc.read.service.ts diff --git a/app/scripts/modules/amazon/vpc/vpcTag.directive.js b/app/scripts/modules/amazon/src/vpc/vpcTag.directive.js similarity index 100% rename from app/scripts/modules/amazon/vpc/vpcTag.directive.js rename to app/scripts/modules/amazon/src/vpc/vpcTag.directive.js diff --git a/app/scripts/modules/amazon/vpc/vpcTag.directive.spec.js b/app/scripts/modules/amazon/src/vpc/vpcTag.directive.spec.js similarity index 100% rename from app/scripts/modules/amazon/vpc/vpcTag.directive.spec.js rename to app/scripts/modules/amazon/src/vpc/vpcTag.directive.spec.js diff --git a/app/scripts/modules/core/src/cluster/filter/clusterFilter.service.spec.ts b/app/scripts/modules/core/src/cluster/filter/clusterFilter.service.spec.ts index 388adfa0903..04c260e3c9a 100644 --- a/app/scripts/modules/core/src/cluster/filter/clusterFilter.service.spec.ts +++ b/app/scripts/modules/core/src/cluster/filter/clusterFilter.service.spec.ts @@ -25,7 +25,7 @@ describe('Service: clusterFilterService', function () { APPLICATION_MODEL_BUILDER, CLUSTER_FILTER_MODEL, CLUSTER_SERVICE, - require('root/test/mock/mockApplicationData.js') + require('./mockApplicationData.js') ); mock.inject( function (clusterFilterService: ClusterFilterService, _ClusterFilterModel_: any, _MultiselectModel_: any, diff --git a/test/mock/mockApplicationData.js b/app/scripts/modules/core/src/cluster/filter/mockApplicationData.js similarity index 100% rename from test/mock/mockApplicationData.js rename to app/scripts/modules/core/src/cluster/filter/mockApplicationData.js diff --git a/test/test_index.js b/test/test_index.js deleted file mode 100644 index 72100ed9277..00000000000 --- a/test/test_index.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict'; - -var testsContext = require.context('../app/scripts/', true, /\.spec\.(js|ts)$/); -testsContext.keys().forEach(testsContext); diff --git a/tsconfig.json b/tsconfig.json index 88473648c8a..42888af6d20 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,7 +27,9 @@ "@spinnaker/docker": ["docker/src"], "docker/*": ["docker/src/*"], "docker": ["docker/src"], - "@spinnaker/amazon": ["amazon"] + "@spinnaker/amazon": ["amazon/src"], + "amazon/*": ["amazon/src"], + "amazon": ["amazon/src"] }, "pretty": true, "removeComments": true, diff --git a/webpack.common.js b/webpack.common.js index 738495cd96f..cb5fd1f1d3f 100644 --- a/webpack.common.js +++ b/webpack.common.js @@ -34,8 +34,8 @@ function configure(IS_TEST) { '@spinnaker/core': path.join(__dirname, 'app', 'scripts', 'modules', 'core', 'src'), 'docker': path.join(__dirname, 'app', 'scripts', 'modules', 'docker', 'src'), '@spinnaker/docker': path.join(__dirname, 'app', 'scripts', 'modules', 'docker', 'src'), - 'amazon': path.join(__dirname, 'app', 'scripts', 'modules', 'amazon'), - '@spinnaker/amazon': path.join(__dirname, 'app', 'scripts', 'modules', 'amazon'), + 'amazon': path.join(__dirname, 'app', 'scripts', 'modules', 'amazon', 'src'), + '@spinnaker/amazon': path.join(__dirname, 'app', 'scripts', 'modules', 'amazon', 'src'), } }, module: {