refactor(aws): move amazon code to src directory

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'),

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'),
+    },
+  });
+});

app/scripts/modules/amazon/index.ts → app/scripts/modules/amazon/src/index.ts

@@ -1,3 +1,5 @@
+export { AMAZON_MODULE } from './aws.module';
+
 export * from './domain';
 
 export * from './keyPairs';

app/scripts/modules/amazon/serverGroup/configure/serverGroupCommandBuilder.spec.js → 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(

app/scripts/modules/amazon/serverGroup/configure/wizard/CloneServerGroup.aws.controller.spec.js → 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(

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,

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,

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: {