Organized files and updated imports

khewonc · Apr 28, 2021 · 611e8ab · 611e8ab
1 parent 8248bd6
commit 611e8ab
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 25 deletions.
diff --git a/bin/main.ts b/bin/main.ts
@@ -4,17 +4,17 @@ import { InstanceType, IVpc } from '@aws-cdk/aws-ec2';
 import { Cluster, FargateProfileOptions, KubernetesVersion, MachineImageType, NodegroupAmiType } from '@aws-cdk/aws-eks';
 
 // Blueprint
-import { CdkEksBlueprintStack, ClusterAddOn, ClusterInfo, ClusterProvider, TeamSetup } from '../lib/eksBlueprintStack';
+import { CdkEksBlueprintStack, ClusterAddOn, ClusterInfo, ClusterProvider, TeamSetup } from '../lib/stacks/eks-blueprint-stack';
 
 // Addons 
 import * as addon from '../lib/addons'
 
 // Cluster Providers
-import { FargateClusterProvider } from '../lib/fargate-cluster-provider';
-import { EC2ClusterProvider, EC2ProviderClusterProps } from '../lib/ec2-cluster-provider';
+import { FargateClusterProvider } from '../lib/cluster-providers/fargate-cluster-provider';
+import { EC2ClusterProvider, EC2ProviderClusterProps } from '../lib/cluster-providers/ec2-cluster-provider';
 
 // Pipeline
-import { PipelineStack } from '../lib/pipelineStack';
+import { PipelineStack } from '../lib/stacks/pipeline-stack';
 
 // Teams
 import { TeamBurnhamSetup } from '../lib/teams/team-burnham/setup';

diff --git a/lib/addons/appmesh/index.ts b/lib/addons/appmesh/index.ts
@@ -1,6 +1,6 @@
 import { ManagedPolicy } from "@aws-cdk/aws-iam";
 
-import { ClusterAddOn, ClusterInfo } from "../../eksBlueprintStack"
+import { ClusterAddOn, ClusterInfo } from "../../stacks/eks-blueprint-stack"
 
 export class AppMeshAddon implements ClusterAddOn {
 
@@ -29,7 +29,7 @@ export class AppMeshAddon implements ClusterAddOn {
         sa.node.addDependency(appMeshNS);
 
         // App Mesh Controller        
-        const chart = cluster.addHelmChart("AppMeshAddon", {
+        const chart = cluster.addHelmChart("appmesh-addon", {
             chart: "appmesh-controller",
             repository: "https://aws.github.io/eks-charts",
             release: "appm-release",

diff --git a/lib/addons/argocd/index.ts b/lib/addons/argocd/index.ts
@@ -1,6 +1,6 @@
 import { KubernetesManifest } from "@aws-cdk/aws-eks";
-import { ClusterAddOn, ClusterInfo } from "../../eksBlueprintStack";
-import { loadYaml, readYamlDocument } from "../../utils/yamlUtils";
+import { ClusterAddOn, ClusterInfo } from "../../stacks/eks-blueprint-stack";
+import { loadYaml, readYamlDocument } from "../../utils/yaml-utils";
 
 export class ArgoCDAddon implements ClusterAddOn {
 

diff --git a/lib/addons/calico/index.ts b/lib/addons/calico/index.ts
@@ -1,4 +1,4 @@
-import { ClusterAddOn, ClusterInfo } from "../../eksBlueprintStack";
+import { ClusterAddOn, ClusterInfo } from "../../stacks/eks-blueprint-stack";
 
 export class CalicoAddon implements ClusterAddOn {
 

diff --git a/lib/ec2-cluster-provider.ts → ...cluster-providers/ec2-cluster-provider.ts b/lib/ec2-cluster-provider.ts → ...cluster-providers/ec2-cluster-provider.ts
diff --git a/lib/fargate-cluster-provider.ts → ...ter-providers/fargate-cluster-provider.ts b/lib/fargate-cluster-provider.ts → ...ter-providers/fargate-cluster-provider.ts
diff --git a/lib/index.ts b/lib/index.ts
@@ -1,3 +1,3 @@
-export * from './eksBlueprintStack';
+export * from './stacks/eks-blueprint-stack';
 export * as Addons from './addons';
 
diff --git a/lib/eksBlueprintStack.ts → lib/stacks/eks-blueprint-stack.ts b/lib/eksBlueprintStack.ts → lib/stacks/eks-blueprint-stack.ts
diff --git a/lib/pipelineStack.ts → lib/stacks/pipeline-stack.ts b/lib/pipelineStack.ts → lib/stacks/pipeline-stack.ts
diff --git a/lib/utils/yamlUtils.ts → lib/utils/yaml-utils.ts b/lib/utils/yamlUtils.ts → lib/utils/yaml-utils.ts
@@ -3,7 +3,6 @@ import * as yaml from 'js-yaml';
 import * as eks from '@aws-cdk/aws-eks';
 import request from 'sync-request';
 
-
 export function readYamlFromDir(dir: string, cluster: eks.Cluster) {
     fs.readdir(dir, 'utf8', (err, files) => {
         if (files != undefined) {
@@ -47,5 +46,5 @@ export function loadExternalYaml(url: string): any {
 }
 
 export function serializeYaml(document: any): string {
-  return yaml.safeDump(document);
+    return yaml.safeDump(document);
 }
diff --git a/bootstrap-pipeline.sh → scripts/bootstrap-pipeline.sh b/bootstrap-pipeline.sh → scripts/bootstrap-pipeline.sh
diff --git a/test/cdk-eks-blueprint.test.ts b/test/cdk-eks-blueprint.test.ts
@@ -1,21 +1,21 @@
 import { expect as expectCDK, haveResource } from '@aws-cdk/assert';
 import * as cdk from '@aws-cdk/core';
-import * as CdkEksBlueprint from '../lib/eksBlueprintStack';
+import * as CdkEksBlueprint from '../lib/stacks/eks-blueprint-stack';
 
 test('SQS Queue Created', () => {
-  const app = new cdk.App();
-  // WHEN
-  const stack = new CdkEksBlueprint.CdkEksBlueprintStack(app, { id: 'MyTestStack' });
-  // THEN
-  expectCDK(stack).to(haveResource("AWS::SQS::Queue", {
-    VisibilityTimeout: 300
-  }));
+    const app = new cdk.App();
+    // WHEN
+    const stack = new CdkEksBlueprint.CdkEksBlueprintStack(app, { id: 'MyTestStack' });
+    // THEN
+    expectCDK(stack).to(haveResource("AWS::SQS::Queue", {
+        VisibilityTimeout: 300
+    }));
 });
 
 test('SNS Topic Created', () => {
-  const app = new cdk.App();
-  // WHEN
-  const stack = new CdkEksBlueprint.CdkEksBlueprintStack(app,   { id: 'MyTestStack' });
-  // THEN
-  expectCDK(stack).to(haveResource("AWS::SNS::Topic"));
+    const app = new cdk.App();
+    // WHEN
+    const stack = new CdkEksBlueprint.CdkEksBlueprintStack(app, { id: 'MyTestStack' });
+    // THEN
+    expectCDK(stack).to(haveResource("AWS::SNS::Topic"));
 });