@fjall/components-infrastructure 0.1.16 → 0.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/lib/config/aws/ecrDefaultImage.js +3 -3
- package/dist/lib/config/aws/identityCenter.d.ts +1 -2
- package/dist/lib/config/aws/identityCenter.js +7 -2
- package/dist/lib/config/aws/identityCenterGroupMembership.d.ts +10 -0
- package/dist/lib/config/aws/identityCenterGroupMembership.js +96 -0
- package/dist/lib/config/aws/index.d.ts +0 -1
- package/dist/lib/config/aws/index.js +1 -2
- package/dist/lib/config/aws/ipamPoolId.d.ts +1 -1
- package/dist/lib/config/aws/ipamPoolId.js +3 -3
- package/dist/lib/config/aws/organisationsAccess.d.ts +10 -0
- package/dist/lib/config/aws/organisationsAccess.js +40 -0
- package/dist/lib/patterns/aws/basicApp.d.ts +0 -1
- package/dist/lib/patterns/aws/basicApp.js +4 -4
- package/dist/lib/patterns/aws/buildkite.d.ts +1 -1
- package/dist/lib/patterns/aws/buildkite.js +2 -2
- package/dist/lib/patterns/aws/freeTierApp.d.ts +0 -1
- package/dist/lib/patterns/aws/freeTierApp.js +2 -4
- package/dist/lib/patterns/aws/managedAccount.d.ts +0 -1
- package/dist/lib/patterns/aws/managedAccount.js +8 -8
- package/dist/lib/patterns/aws/managedIdentityCenter.d.ts +4 -0
- package/dist/lib/patterns/aws/managedIdentityCenter.js +24 -0
- package/dist/lib/patterns/aws/managedOrganisation.d.ts +1 -2
- package/dist/lib/patterns/aws/managedOrganisation.js +11 -12
- package/dist/lib/resources/aws/compute/ecs.js +2 -4
- package/dist/lib/resources/aws/database/rdsFreeTier.js +2 -3
- package/dist/lib/resources/aws/networking/ipamPool.js +11 -12
- package/dist/lib/resources/aws/networking/vpc.d.ts +7 -2
- package/dist/lib/resources/aws/networking/vpc.js +23 -19
- package/dist/lib/utils/getAccountId.js +2 -2
- package/dist/lib/utils/getConfig.d.ts +4 -5
- package/dist/lib/utils/getConfig.js +23 -45
- package/package.json +23 -23
- package/dist/lib/config/aws/delegateHostedZoneRole.d.ts +0 -5
- package/dist/lib/config/aws/delegateHostedZoneRole.js +0 -77
- package/dist/lib/config/aws/identityCenterUser.d.ts +0 -16
- package/dist/lib/config/aws/identityCenterUser.js +0 -125
- package/dist/lib/config/aws/ipamPool.d.ts +0 -5
- package/dist/lib/config/aws/ipamPool.js +0 -56
- package/dist/lib/config/aws/ipamPoolResourceShare.d.ts +0 -5
- package/dist/lib/config/aws/ipamPoolResourceShare.js +0 -42
- package/dist/lib/config/aws/ramEnableSharing.d.ts +0 -5
- package/dist/lib/config/aws/ramEnableSharing.js +0 -35
- package/dist/lib/config/aws/users.d.ts +0 -5
- package/dist/lib/config/aws/users.js +0 -126
- package/dist/lib/config/fjall/hostedZones/fjall.io.d.ts +0 -10
- package/dist/lib/config/fjall/hostedZones/fjall.io.js +0 -25
- package/dist/lib/resources/aws/constant/ecr.d.ts +0 -12
- package/dist/lib/resources/aws/constant/ecr.js +0 -30
- package/dist/lib/resources/aws/constant/vpc.d.ts +0 -26
- package/dist/lib/resources/aws/constant/vpc.js +0 -63
- package/dist/lib/resources/aws/networking/hostedZone.d.ts +0 -21
- package/dist/lib/resources/aws/networking/hostedZone.js +0 -68
- package/dist/lib/resources/aws/store/alias.d.ts +0 -5
- package/dist/lib/resources/aws/store/alias.js +0 -13
- package/dist/lib/resources/aws/store/database.d.ts +0 -18
- package/dist/lib/resources/aws/store/database.js +0 -33
- package/dist/lib/resources/aws/store/index.d.ts +0 -7
- package/dist/lib/resources/aws/store/index.js +0 -24
- package/dist/lib/resources/aws/store/kms.d.ts +0 -14
- package/dist/lib/resources/aws/store/kms.js +0 -34
- package/dist/lib/resources/aws/store/parameter.d.ts +0 -26
- package/dist/lib/resources/aws/store/parameter.js +0 -100
- package/dist/lib/resources/aws/store/rds.d.ts +0 -25
- package/dist/lib/resources/aws/store/rds.js +0 -132
- package/dist/lib/resources/aws/store/s3.d.ts +0 -11
- package/dist/lib/resources/aws/store/s3.js +0 -43
- package/dist/lib/resources/aws/store/secret.d.ts +0 -26
- package/dist/lib/resources/aws/store/secret.js +0 -55
- package/dist/lib/utils/usersConfig.d.ts +0 -7
- package/dist/lib/utils/usersConfig.js +0 -18
|
@@ -193,9 +193,7 @@ class FargateCluster extends constructs_1.Construct {
|
|
|
193
193
|
healthCheck: {
|
|
194
194
|
interval: aws_cdk_lib_1.Duration.seconds(120),
|
|
195
195
|
path: props.healthCheckPath || "/",
|
|
196
|
-
port: props.containerPort
|
|
197
|
-
? `"${props.containerPort}"`
|
|
198
|
-
: "traffic-port",
|
|
196
|
+
port: props.containerPort ? `${props.containerPort}` : "traffic-port",
|
|
199
197
|
timeout: aws_cdk_lib_1.Duration.seconds(10)
|
|
200
198
|
}
|
|
201
199
|
})
|
|
@@ -266,4 +264,4 @@ class FargateCluster extends constructs_1.Construct {
|
|
|
266
264
|
}
|
|
267
265
|
}
|
|
268
266
|
exports.default = FargateCluster;
|
|
269
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ecs.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/ecs.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  AwsLogDriver,\n  Cluster as CdkCluster,\n  ContainerImage,\n  FargateService,\n  FargateTaskDefinition,\n  ListenerConfig,\n  PropagatedTagSource,\n  RepositoryImage,\n  ContainerDefinition\n} from \"aws-cdk-lib/aws-ecs\";\nimport {\n  Connections,\n  IConnectable,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { StackBuilder } from \"../awsStack\";\nimport { Duration, Fn, SecretValue } from \"aws-cdk-lib\";\nimport {\n  ApplicationListener,\n  ApplicationLoadBalancer,\n  ApplicationProtocol\n} from \"aws-cdk-lib/aws-elasticloadbalancingv2\";\nimport tagResource from \"../../../utils/tagResource\";\nimport {\n  CompositePrincipal,\n  Effect,\n  IManagedPolicy,\n  PolicyDocument,\n  PolicyStatement,\n  Role,\n  ServicePrincipal\n} from \"aws-cdk-lib/aws-iam\";\nimport {\n  PredefinedMetric,\n  ScalableTarget,\n  ServiceNamespace,\n  TargetTrackingScalingPolicy\n} from \"aws-cdk-lib/aws-applicationautoscaling\";\nimport { Secret as EcsSecret } from \"aws-cdk-lib/aws-ecs\";\nimport { Secret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport {\n  Certificate,\n  CertificateValidation\n} from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  ARecord,\n  HostedZone,\n  RecordTarget,\n  IHostedZone\n} from \"aws-cdk-lib/aws-route53\";\nimport { LoadBalancerTarget } from \"aws-cdk-lib/aws-route53-targets\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\nimport { KeyValue } from \"../../../types\";\n\nexport enum Protocol {\n  HTTP,\n  HTTPS\n}\n\nexport enum ScalingType {\n  CPU = PredefinedMetric.ECS_SERVICE_AVERAGE_CPU_UTILIZATION,\n  MEMORY = PredefinedMetric.ECS_SERVICE_AVERAGE_MEMORY_UTILIZATION\n}\n\nexport interface ContainerSecret {\n  [key: string]: SecretValue;\n}\n\ntype FargateClusterProps = {\n  ecrRepository: Repository | RepositoryImage;\n  clusterName: string;\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerSecrets?: ContainerSecret;\n  containerPort?: number;\n  cpu?: number;\n  databaseConnection: IConnectable;\n  parentDomain?: string; // TODO: Break out a HTTP and HTTPS service where this is optional\n  desiredCount?: number;\n  healthCheckPath?: string;\n  listenerPort?: number;\n  memoryLimitMiB?: number;\n  publicLoadBalancer?: boolean;\n  protocol: Protocol;\n  scalingType?: ScalingType;\n  serviceName: string;\n  tags: KeyValue;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagedPolicies?: IManagedPolicy[];\n  vpc?: IVpc;\n};\n\nexport default class FargateCluster extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private cluster: CdkCluster;\n  private loadBalancer: ApplicationLoadBalancer;\n  private executionRole: Role;\n  private taskDefinition: FargateTaskDefinition;\n  private containerDefinition: ContainerDefinition;\n  private fargateService: FargateService;\n  private scalingPolicy: TargetTrackingScalingPolicy;\n  private hostedZone: IHostedZone;\n  private certificate: Certificate;\n  private aRecord: ARecord;\n  private loadBalancerListener: ApplicationListener;\n\n  private secrets: {\n    [key: string]: EcsSecret;\n  } = {};\n\n  constructor(scope: Construct, id: string, props: FargateClusterProps) {\n    super(scope, id);\n\n    this.addCluster(props);\n    this.addSecrets(props);\n    this.addExecutionRole(props);\n    this.addTaskDefinition(props);\n    this.addContainerDefinition(props);\n    this.addFargateService(props);\n    this.addLoadBalancer(props);\n\n    if (!!props.parentDomain) this.addHostedZone(props);\n\n    this.addLoadBalancerListener(props);\n    this.registerLoadBalancerTargets(props);\n\n    //todo: fix connections not working automatically\n    if (props.databaseConnection) {\n      this.fargateService.connections.allowTo(\n        props.databaseConnection,\n        Port.POSTGRES\n      );\n    }\n  }\n\n  addCluster(props: FargateClusterProps) {\n    this.cluster = new CdkCluster(this, `${props.clusterName}`, {\n      vpc: props.vpc,\n      clusterName: props.clusterName,\n      containerInsights: true,\n      enableFargateCapacityProviders: true\n    });\n    tagResource(this.cluster, props.tags);\n  }\n\n  addSecrets(props: FargateClusterProps) {\n    // Container Secrets\n    const containerSecret = Secret.fromSecretNameV2(\n      this,\n      `${props.clusterName}Secret`,\n      `/${props.clusterName}/${props.serviceName}`\n    );\n\n    for (const secretField in props.containerSecrets) {\n      this.secrets[secretField] = EcsSecret.fromSecretsManager(\n        containerSecret,\n        secretField\n      );\n    }\n  }\n\n  addExecutionRole(props: FargateClusterProps) {\n    this.executionRole = new Role(this, `${props.serviceName}ExecutionRole`, {\n      roleName: `${props.serviceName}ExecutionRole`,\n      description: `${props.serviceName} Execution Role`,\n      managedPolicies: [\n        {\n          managedPolicyArn:\n            \"arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy\"\n        }\n      ],\n      inlinePolicies: {\n        [\"readSecrets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\n                \"secretsmanager:GetSecretValue\",\n                \"secretsmanager:DescribeSecret\"\n              ],\n              resources: [\"*\"] // TODO: Set this to the secret ARN\n            })\n          ]\n        }),\n        [\"decryptSecrets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"kms:Decrypt\"],\n              resources: [\"*\"] // TODO: Set this to the KMS Arn\n            })\n          ]\n        }),\n        [\"ecsExecuteCommand\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\n                \"ssmmessages:CreateControlChannel\",\n                \"ssmmessages:CreateDataChannel\",\n                \"ssmmessages:OpenControlChannel\",\n                \"ssmmessages:OpenDataChannel\"\n              ],\n              effect: Effect.ALLOW,\n              resources: [\"*\"]\n            })\n          ]\n        })\n      },\n      assumedBy: new CompositePrincipal(\n        new ServicePrincipal(\"ecs-tasks.amazonaws.com\")\n      )\n    });\n  }\n\n  addTaskDefinition(props: FargateClusterProps) {\n    this.taskDefinition = new FargateTaskDefinition(\n      this,\n      `${props.serviceName}TaskDefinition`,\n      {\n        cpu: props.cpu || 256,\n        executionRole: this.executionRole,\n        taskRole: new Role(this, `${props.serviceName}TaskRole`, {\n          roleName: `${props.serviceName}TaskRole`,\n          description: `${props.serviceName} Task Role`,\n          inlinePolicies: props.taskRoleInlinePolicies,\n          managedPolicies: props.taskRoleManagedPolicies,\n          assumedBy: new CompositePrincipal(\n            new ServicePrincipal(\"ecs-tasks.amazonaws.com\")\n          )\n        }),\n        memoryLimitMiB: props.memoryLimitMiB || 512\n      }\n    );\n    tagResource(this.taskDefinition, props.tags);\n  }\n\n  addContainerDefinition(props: FargateClusterProps) {\n    this.containerDefinition = this.taskDefinition.addContainer(\n      `${props.serviceName}ContainerDefinition`,\n      {\n        image: this.getImage(props),\n        containerName: props.serviceName,\n        environment: {\n          ...props.containerEnvironment\n        },\n        command: props.containerCommand,\n        secrets: {\n          ...this.secrets\n        },\n        //todo: provide health check options\n        // healthCheck: {\n        //   command: [\n        //     \"CMD-SHELL\",\n        //     `timeout 10s /bin/sh -c ':> /dev/tcp/127.0.0.1/${props.containerPort}' || exit 1`\n        //   ]\n        // },\n        logging: new AwsLogDriver({\n          streamPrefix: `/ecs/${props.clusterName}/${props.serviceName}`,\n          logRetention: 14\n        }),\n        portMappings: props.containerPort\n          ? [{ containerPort: props.containerPort }]\n          : [{ containerPort: 80 }]\n      }\n    );\n    tagResource(this.containerDefinition, props.tags);\n  }\n\n  addFargateService(props: FargateClusterProps) {\n    this.fargateService = new FargateService(\n      this,\n      `${props.serviceName}FargateService`,\n      {\n        circuitBreaker: { rollback: true },\n        cluster: this.cluster,\n        desiredCount: 2,\n        enableECSManagedTags: true,\n        enableExecuteCommand: true,\n        propagateTags: PropagatedTagSource.SERVICE,\n        serviceName: `${props.serviceName}`,\n        taskDefinition: this.taskDefinition\n      }\n    );\n    tagResource(this.fargateService, props.tags);\n  }\n\n  addScalingPolicy(props: FargateClusterProps) {\n    this.scalingPolicy = new TargetTrackingScalingPolicy(\n      this,\n      `${props.serviceName}ScalingPolicy`,\n      {\n        policyName: `${props.serviceName}ScalingPolicy`,\n        scalingTarget: new ScalableTarget(\n          this,\n          `${props.serviceName}scalableTarget`,\n          {\n            maxCapacity: 10,\n            minCapacity: 2,\n            resourceId: `service/${this.cluster.clusterName}/${this.fargateService.serviceName}`,\n            scalableDimension: \"ecs:service:DesiredCount\",\n            serviceNamespace: ServiceNamespace.ECS\n          }\n        ),\n        targetValue: 50,\n        scaleOutCooldown: Duration.seconds(60),\n        scaleInCooldown: Duration.seconds(60),\n        predefinedMetric:\n          props.scalingType == ScalingType.MEMORY\n            ? PredefinedMetric.ECS_SERVICE_AVERAGE_MEMORY_UTILIZATION\n            : PredefinedMetric.ECS_SERVICE_AVERAGE_CPU_UTILIZATION\n      }\n    );\n  }\n\n  registerLoadBalancerTargets(props: FargateClusterProps) {\n    this.fargateService.registerLoadBalancerTargets({\n      containerName: this.containerDefinition.containerName,\n      containerPort: this.containerDefinition.containerPort,\n      newTargetGroupId: `${props.serviceName}TargetGroup`,\n      listener: ListenerConfig.applicationListener(this.loadBalancerListener, {\n        port: props.containerPort,\n        protocol: ApplicationProtocol.HTTP,\n        healthCheck: {\n          interval: Duration.seconds(120),\n          path: props.healthCheckPath || \"/\",\n          port: props.containerPort\n            ? `\"${props.containerPort}\"`\n            : \"traffic-port\",\n          timeout: Duration.seconds(10)\n        }\n      })\n    });\n  }\n\n  addLoadBalancer(props: FargateClusterProps) {\n    this.loadBalancer = new ApplicationLoadBalancer(\n      this,\n      `${props.clusterName}LoadBalancer`,\n      {\n        vpc: this.cluster.vpc,\n        internetFacing: true,\n        loadBalancerName: `${props.serviceName}LoadBalancer`,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n    tagResource(this.loadBalancer, props.tags);\n  }\n\n  addLoadBalancerListener(props: FargateClusterProps) {\n    if (!!this.certificate) {\n      this.loadBalancerListener = this.loadBalancer.addListener(\n        `${props.serviceName}Listener`,\n        {\n          port: props.protocol == Protocol.HTTP ? 80 : 443,\n          certificates: [this.certificate]\n        }\n      );\n    } else {\n      this.loadBalancerListener = this.loadBalancer.addListener(\n        `${props.serviceName}Listener`,\n        {\n          port: props.protocol == Protocol.HTTP ? 80 : 443\n        }\n      );\n    }\n\n    tagResource(this.loadBalancerListener, props.tags);\n  }\n\n  addHostedZone(props: FargateClusterProps) {\n    if (!props.parentDomain) return;\n\n    this.hostedZone = HostedZone.fromHostedZoneAttributes(this, \"hostedZone\", {\n      hostedZoneId: Fn.importValue(\n        `${props.parentDomain.split(\".\").join(\"\")}HostedZoneId`\n      ),\n      zoneName: props.parentDomain\n    });\n\n    this.certificate = new Certificate(\n      this,\n      `${props.serviceName}Certificate`,\n      {\n        domainName: `${props.serviceName}.${props.clusterName}.${props.parentDomain}`,\n        validation: CertificateValidation.fromDns(this.hostedZone)\n      }\n    );\n\n    this.aRecord = new ARecord(\n      this,\n      `${props.serviceName}.${props.clusterName}.${props.parentDomain}ARecord`,\n      {\n        recordName: `${props.serviceName}.${props.clusterName}.${props.parentDomain}`,\n        zone: this.hostedZone,\n        target: RecordTarget.fromAlias(\n          new LoadBalancerTarget(this.loadBalancer)\n        )\n      }\n    );\n  }\n\n  getImage(props: FargateClusterProps): ContainerImage {\n    if (!props.ecrRepository)\n      return ContainerImage.fromRegistry(\"amazon/amazon-ecs-sample\");\n    if (props.ecrRepository instanceof ContainerImage)\n      return props.ecrRepository;\n    if (props.ecrRepository instanceof Repository) {\n      return ContainerImage.fromEcrRepository(props.ecrRepository, \"latest\");\n    }\n    return ContainerImage.fromRegistry(\"amazon/amazon-ecs-sample\");\n  }\n\n  static build(\n    id: string,\n    props: FargateClusterProps\n  ): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      const newProps: FargateClusterProps = {\n        ...props,\n        ...{\n          vpc: (sb.getNetwork() as IVpc) || props.vpc\n        }\n      };\n      return new this(sb.getStack(), id, newProps);\n    };\n  }\n}\n"]}
|
|
267
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ecs.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/compute/ecs.ts"],"names":[],"mappings":";;;AAAA,iDAU6B;AAC7B,iDAM6B;AAC7B,2CAAuC;AAEvC,6CAAwD;AACxD,uFAIgD;AAChD,4DAAqD;AACrD,iDAQ6B;AAC7B,uFAKgD;AAChD,iDAA0D;AAC1D,uEAAwD;AACxD,+EAG4C;AAC5C,yDAKiC;AACjC,yEAAqE;AACrE,iDAAiD;AAGjD,IAAY,QAGX;AAHD,WAAY,QAAQ;IAClB,uCAAI,CAAA;IACJ,yCAAK,CAAA;AACP,CAAC,EAHW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAGnB;AAED,IAAY,WAGX;AAHD,WAAY,WAAW;IACrB,sDAA0D,CAAA;IAC1D,4DAAgE,CAAA;AAClE,CAAC,EAHW,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAGtB;AAgCD,MAAqB,cAAe,SAAQ,sBAAS;IAmBnD,YAAY,KAAgB,EAAE,EAAU,EAAE,KAA0B;QAClE,KAAK,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QALX,YAAO,GAEX,EAAE,CAAC;QAKL,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QACvB,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAC9B,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,CAAC,KAAK,CAAC,YAAY;YAAE,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpD,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;QAExC,iDAAiD;QACjD,IAAI,KAAK,CAAC,kBAAkB,EAAE;YAC5B,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,OAAO,CACrC,KAAK,CAAC,kBAAkB,EACxB,cAAI,CAAC,QAAQ,CACd,CAAC;SACH;IACH,CAAC;IAED,UAAU,CAAC,KAA0B;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE,EAAE;YAC1D,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,WAAW,EAAE,KAAK,CAAC,WAAW;YAC9B,iBAAiB,EAAE,IAAI;YACvB,8BAA8B,EAAE,IAAI;SACrC,CAAC,CAAC;QACH,IAAA,qBAAW,EAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,UAAU,CAAC,KAA0B;QACnC,oBAAoB;QACpB,MAAM,eAAe,GAAG,2BAAM,CAAC,gBAAgB,CAC7C,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,QAAQ,EAC5B,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,EAAE,CAC7C,CAAC;QAEF,KAAK,MAAM,WAAW,IAAI,KAAK,CAAC,gBAAgB,EAAE;YAChD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,gBAAS,CAAC,kBAAkB,CACtD,eAAe,EACf,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IAED,gBAAgB,CAAC,KAA0B;QACzC,IAAI,CAAC,aAAa,GAAG,IAAI,cAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,eAAe,EAAE;YACvE,QAAQ,EAAE,GAAG,KAAK,CAAC,WAAW,eAAe;YAC7C,WAAW,EAAE,GAAG,KAAK,CAAC,WAAW,iBAAiB;YAClD,eAAe,EAAE;gBACf;oBACE,gBAAgB,EACd,uEAAuE;iBAC1E;aACF;YACD,cAAc,EAAE;gBACd,CAAC,aAAa,CAAC,EAAE,IAAI,wBAAc,CAAC;oBAClC,UAAU,EAAE;wBACV,IAAI,yBAAe,CAAC;4BAClB,OAAO,EAAE;gCACP,+BAA+B;gCAC/B,+BAA+B;6BAChC;4BACD,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,mCAAmC;yBACrD,CAAC;qBACH;iBACF,CAAC;gBACF,CAAC,gBAAgB,CAAC,EAAE,IAAI,wBAAc,CAAC;oBACrC,UAAU,EAAE;wBACV,IAAI,yBAAe,CAAC;4BAClB,OAAO,EAAE,CAAC,aAAa,CAAC;4BACxB,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,gCAAgC;yBAClD,CAAC;qBACH;iBACF,CAAC;gBACF,CAAC,mBAAmB,CAAC,EAAE,IAAI,wBAAc,CAAC;oBACxC,UAAU,EAAE;wBACV,IAAI,yBAAe,CAAC;4BAClB,OAAO,EAAE;gCACP,kCAAkC;gCAClC,+BAA+B;gCAC/B,gCAAgC;gCAChC,6BAA6B;6BAC9B;4BACD,MAAM,EAAE,gBAAM,CAAC,KAAK;4BACpB,SAAS,EAAE,CAAC,GAAG,CAAC;yBACjB,CAAC;qBACH;iBACF,CAAC;aACH;YACD,SAAS,EAAE,IAAI,4BAAkB,CAC/B,IAAI,0BAAgB,CAAC,yBAAyB,CAAC,CAChD;SACF,CAAC,CAAC;IACL,CAAC;IAED,iBAAiB,CAAC,KAA0B;QAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,+BAAqB,CAC7C,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,gBAAgB,EACpC;YACE,GAAG,EAAE,KAAK,CAAC,GAAG,IAAI,GAAG;YACrB,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,QAAQ,EAAE,IAAI,cAAI,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,WAAW,UAAU,EAAE;gBACvD,QAAQ,EAAE,GAAG,KAAK,CAAC,WAAW,UAAU;gBACxC,WAAW,EAAE,GAAG,KAAK,CAAC,WAAW,YAAY;gBAC7C,cAAc,EAAE,KAAK,CAAC,sBAAsB;gBAC5C,eAAe,EAAE,KAAK,CAAC,uBAAuB;gBAC9C,SAAS,EAAE,IAAI,4BAAkB,CAC/B,IAAI,0BAAgB,CAAC,yBAAyB,CAAC,CAChD;aACF,CAAC;YACF,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,GAAG;SAC5C,CACF,CAAC;QACF,IAAA,qBAAW,EAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,sBAAsB,CAAC,KAA0B;QAC/C,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CACzD,GAAG,KAAK,CAAC,WAAW,qBAAqB,EACzC;YACE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;YAC3B,aAAa,EAAE,KAAK,CAAC,WAAW;YAChC,WAAW,EAAE;gBACX,GAAG,KAAK,CAAC,oBAAoB;aAC9B;YACD,OAAO,EAAE,KAAK,CAAC,gBAAgB;YAC/B,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,OAAO;aAChB;YACD,oCAAoC;YACpC,iBAAiB;YACjB,eAAe;YACf,mBAAmB;YACnB,wFAAwF;YACxF,MAAM;YACN,KAAK;YACL,OAAO,EAAE,IAAI,sBAAY,CAAC;gBACxB,YAAY,EAAE,QAAQ,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,EAAE;gBAC9D,YAAY,EAAE,EAAE;aACjB,CAAC;YACF,YAAY,EAAE,KAAK,CAAC,aAAa;gBAC/B,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,CAAC;gBAC1C,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;SAC5B,CACF,CAAC;QACF,IAAA,qBAAW,EAAC,IAAI,CAAC,mBAAmB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,iBAAiB,CAAC,KAA0B;QAC1C,IAAI,CAAC,cAAc,GAAG,IAAI,wBAAc,CACtC,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,gBAAgB,EACpC;YACE,cAAc,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;YAClC,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,YAAY,EAAE,CAAC;YACf,oBAAoB,EAAE,IAAI;YAC1B,oBAAoB,EAAE,IAAI;YAC1B,aAAa,EAAE,6BAAmB,CAAC,OAAO;YAC1C,WAAW,EAAE,GAAG,KAAK,CAAC,WAAW,EAAE;YACnC,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CACF,CAAC;QACF,IAAA,qBAAW,EAAC,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC;IAED,gBAAgB,CAAC,KAA0B;QACzC,IAAI,CAAC,aAAa,GAAG,IAAI,wDAA2B,CAClD,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,eAAe,EACnC;YACE,UAAU,EAAE,GAAG,KAAK,CAAC,WAAW,eAAe;YAC/C,aAAa,EAAE,IAAI,2CAAc,CAC/B,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,gBAAgB,EACpC;gBACE,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,CAAC;gBACd,UAAU,EAAE,WAAW,IAAI,CAAC,OAAO,CAAC,WAAW,IAAI,IAAI,CAAC,cAAc,CAAC,WAAW,EAAE;gBACpF,iBAAiB,EAAE,0BAA0B;gBAC7C,gBAAgB,EAAE,6CAAgB,CAAC,GAAG;aACvC,CACF;YACD,WAAW,EAAE,EAAE;YACf,gBAAgB,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtC,eAAe,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACrC,gBAAgB,EACd,KAAK,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM;gBACrC,CAAC,CAAC,6CAAgB,CAAC,sCAAsC;gBACzD,CAAC,CAAC,6CAAgB,CAAC,mCAAmC;SAC3D,CACF,CAAC;IACJ,CAAC;IAED,2BAA2B,CAAC,KAA0B;QACpD,IAAI,CAAC,cAAc,CAAC,2BAA2B,CAAC;YAC9C,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,aAAa;YACrD,aAAa,EAAE,IAAI,CAAC,mBAAmB,CAAC,aAAa;YACrD,gBAAgB,EAAE,GAAG,KAAK,CAAC,WAAW,aAAa;YACnD,QAAQ,EAAE,wBAAc,CAAC,mBAAmB,CAAC,IAAI,CAAC,oBAAoB,EAAE;gBACtE,IAAI,EAAE,KAAK,CAAC,aAAa;gBACzB,QAAQ,EAAE,gDAAmB,CAAC,IAAI;gBAClC,WAAW,EAAE;oBACX,QAAQ,EAAE,sBAAQ,CAAC,OAAO,CAAC,GAAG,CAAC;oBAC/B,IAAI,EAAE,KAAK,CAAC,eAAe,IAAI,GAAG;oBAClC,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,cAAc;oBACrE,OAAO,EAAE,sBAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;iBAC9B;aACF,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,KAA0B;QACxC,IAAI,CAAC,YAAY,GAAG,IAAI,oDAAuB,CAC7C,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,cAAc,EAClC;YACE,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG;YACrB,cAAc,EAAE,IAAI;YACpB,gBAAgB,EAAE,GAAG,KAAK,CAAC,WAAW,cAAc;YACpD,UAAU,EAAE;gBACV,UAAU,EAAE,oBAAU,CAAC,MAAM;aAC9B;SACF,CACF,CAAC;QACF,IAAA,qBAAW,EAAC,IAAI,CAAC,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;IAED,uBAAuB,CAAC,KAA0B;QAChD,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE;YACtB,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CACvD,GAAG,KAAK,CAAC,WAAW,UAAU,EAC9B;gBACE,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG;gBAChD,YAAY,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC;aACjC,CACF,CAAC;SACH;aAAM;YACL,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CACvD,GAAG,KAAK,CAAC,WAAW,UAAU,EAC9B;gBACE,IAAI,EAAE,KAAK,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG;aACjD,CACF,CAAC;SACH;QAED,IAAA,qBAAW,EAAC,IAAI,CAAC,oBAAoB,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACrD,CAAC;IAED,aAAa,CAAC,KAA0B;QACtC,IAAI,CAAC,KAAK,CAAC,YAAY;YAAE,OAAO;QAEhC,IAAI,CAAC,UAAU,GAAG,wBAAU,CAAC,wBAAwB,CAAC,IAAI,EAAE,YAAY,EAAE;YACxE,YAAY,EAAE,gBAAE,CAAC,WAAW,CAC1B,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CACxD;YACD,QAAQ,EAAE,KAAK,CAAC,YAAY;SAC7B,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,GAAG,IAAI,oCAAW,CAChC,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,aAAa,EACjC;YACE,UAAU,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,EAAE;YAC7E,UAAU,EAAE,8CAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC;SAC3D,CACF,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,qBAAO,CACxB,IAAI,EACJ,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,SAAS,EACxE;YACE,UAAU,EAAE,GAAG,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,YAAY,EAAE;YAC7E,IAAI,EAAE,IAAI,CAAC,UAAU;YACrB,MAAM,EAAE,0BAAY,CAAC,SAAS,CAC5B,IAAI,wCAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAC1C;SACF,CACF,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,KAA0B;QACjC,IAAI,CAAC,KAAK,CAAC,aAAa;YACtB,OAAO,wBAAc,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;QACjE,IAAI,KAAK,CAAC,aAAa,YAAY,wBAAc;YAC/C,OAAO,KAAK,CAAC,aAAa,CAAC;QAC7B,IAAI,KAAK,CAAC,aAAa,YAAY,oBAAU,EAAE;YAC7C,OAAO,wBAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;SACxE;QACD,OAAO,wBAAc,CAAC,YAAY,CAAC,0BAA0B,CAAC,CAAC;IACjE,CAAC;IAED,MAAM,CAAC,KAAK,CACV,EAAU,EACV,KAA0B;QAE1B,OAAO,CAAC,EAAgB,EAAE,EAAE;YAC1B,MAAM,QAAQ,GAAwB;gBACpC,GAAG,KAAK;gBACR,GAAG;oBACD,GAAG,EAAG,EAAE,CAAC,UAAU,EAAW,IAAI,KAAK,CAAC,GAAG;iBAC5C;aACF,CAAC;YACF,OAAO,IAAI,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;QAC/C,CAAC,CAAC;IACJ,CAAC;CACF;AA7UD,iCA6UC","sourcesContent":["import {\n  AwsLogDriver,\n  Cluster as CdkCluster,\n  ContainerImage,\n  FargateService,\n  FargateTaskDefinition,\n  ListenerConfig,\n  PropagatedTagSource,\n  RepositoryImage,\n  ContainerDefinition\n} from \"aws-cdk-lib/aws-ecs\";\nimport {\n  Connections,\n  IConnectable,\n  IVpc,\n  Port,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport { Construct } from \"constructs\";\nimport { StackBuilder } from \"../awsStack\";\nimport { Duration, Fn, SecretValue } from \"aws-cdk-lib\";\nimport {\n  ApplicationListener,\n  ApplicationLoadBalancer,\n  ApplicationProtocol\n} from \"aws-cdk-lib/aws-elasticloadbalancingv2\";\nimport tagResource from \"../../../utils/tagResource\";\nimport {\n  CompositePrincipal,\n  Effect,\n  IManagedPolicy,\n  PolicyDocument,\n  PolicyStatement,\n  Role,\n  ServicePrincipal\n} from \"aws-cdk-lib/aws-iam\";\nimport {\n  PredefinedMetric,\n  ScalableTarget,\n  ServiceNamespace,\n  TargetTrackingScalingPolicy\n} from \"aws-cdk-lib/aws-applicationautoscaling\";\nimport { Secret as EcsSecret } from \"aws-cdk-lib/aws-ecs\";\nimport { Secret } from \"aws-cdk-lib/aws-secretsmanager\";\nimport {\n  Certificate,\n  CertificateValidation\n} from \"aws-cdk-lib/aws-certificatemanager\";\nimport {\n  ARecord,\n  HostedZone,\n  RecordTarget,\n  IHostedZone\n} from \"aws-cdk-lib/aws-route53\";\nimport { LoadBalancerTarget } from \"aws-cdk-lib/aws-route53-targets\";\nimport { Repository } from \"aws-cdk-lib/aws-ecr\";\nimport { KeyValue } from \"../../../types\";\n\nexport enum Protocol {\n  HTTP,\n  HTTPS\n}\n\nexport enum ScalingType {\n  CPU = PredefinedMetric.ECS_SERVICE_AVERAGE_CPU_UTILIZATION,\n  MEMORY = PredefinedMetric.ECS_SERVICE_AVERAGE_MEMORY_UTILIZATION\n}\n\nexport interface ContainerSecret {\n  [key: string]: SecretValue;\n}\n\ntype FargateClusterProps = {\n  ecrRepository: Repository | RepositoryImage;\n  clusterName: string;\n  containerCommand?: string[];\n  containerEnvironment?: KeyValue;\n  containerSecrets?: ContainerSecret;\n  containerPort?: number;\n  cpu?: number;\n  databaseConnection: IConnectable;\n  parentDomain?: string; // TODO: Break out a HTTP and HTTPS service where this is optional\n  desiredCount?: number;\n  healthCheckPath?: string;\n  listenerPort?: number;\n  memoryLimitMiB?: number;\n  publicLoadBalancer?: boolean;\n  protocol: Protocol;\n  scalingType?: ScalingType;\n  serviceName: string;\n  tags: KeyValue;\n  taskRoleInlinePolicies?: {\n    [name: string]: PolicyDocument;\n  };\n  taskRoleManagedPolicies?: IManagedPolicy[];\n  vpc?: IVpc;\n};\n\nexport default class FargateCluster extends Construct implements IConnectable {\n  public connections: Connections;\n\n  private cluster: CdkCluster;\n  private loadBalancer: ApplicationLoadBalancer;\n  private executionRole: Role;\n  private taskDefinition: FargateTaskDefinition;\n  private containerDefinition: ContainerDefinition;\n  private fargateService: FargateService;\n  private scalingPolicy: TargetTrackingScalingPolicy;\n  private hostedZone: IHostedZone;\n  private certificate: Certificate;\n  private aRecord: ARecord;\n  private loadBalancerListener: ApplicationListener;\n\n  private secrets: {\n    [key: string]: EcsSecret;\n  } = {};\n\n  constructor(scope: Construct, id: string, props: FargateClusterProps) {\n    super(scope, id);\n\n    this.addCluster(props);\n    this.addSecrets(props);\n    this.addExecutionRole(props);\n    this.addTaskDefinition(props);\n    this.addContainerDefinition(props);\n    this.addFargateService(props);\n    this.addLoadBalancer(props);\n\n    if (!!props.parentDomain) this.addHostedZone(props);\n\n    this.addLoadBalancerListener(props);\n    this.registerLoadBalancerTargets(props);\n\n    //todo: fix connections not working automatically\n    if (props.databaseConnection) {\n      this.fargateService.connections.allowTo(\n        props.databaseConnection,\n        Port.POSTGRES\n      );\n    }\n  }\n\n  addCluster(props: FargateClusterProps) {\n    this.cluster = new CdkCluster(this, `${props.clusterName}`, {\n      vpc: props.vpc,\n      clusterName: props.clusterName,\n      containerInsights: true,\n      enableFargateCapacityProviders: true\n    });\n    tagResource(this.cluster, props.tags);\n  }\n\n  addSecrets(props: FargateClusterProps) {\n    // Container Secrets\n    const containerSecret = Secret.fromSecretNameV2(\n      this,\n      `${props.clusterName}Secret`,\n      `/${props.clusterName}/${props.serviceName}`\n    );\n\n    for (const secretField in props.containerSecrets) {\n      this.secrets[secretField] = EcsSecret.fromSecretsManager(\n        containerSecret,\n        secretField\n      );\n    }\n  }\n\n  addExecutionRole(props: FargateClusterProps) {\n    this.executionRole = new Role(this, `${props.serviceName}ExecutionRole`, {\n      roleName: `${props.serviceName}ExecutionRole`,\n      description: `${props.serviceName} Execution Role`,\n      managedPolicies: [\n        {\n          managedPolicyArn:\n            \"arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy\"\n        }\n      ],\n      inlinePolicies: {\n        [\"readSecrets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\n                \"secretsmanager:GetSecretValue\",\n                \"secretsmanager:DescribeSecret\"\n              ],\n              resources: [\"*\"] // TODO: Set this to the secret ARN\n            })\n          ]\n        }),\n        [\"decryptSecrets\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\"kms:Decrypt\"],\n              resources: [\"*\"] // TODO: Set this to the KMS Arn\n            })\n          ]\n        }),\n        [\"ecsExecuteCommand\"]: new PolicyDocument({\n          statements: [\n            new PolicyStatement({\n              actions: [\n                \"ssmmessages:CreateControlChannel\",\n                \"ssmmessages:CreateDataChannel\",\n                \"ssmmessages:OpenControlChannel\",\n                \"ssmmessages:OpenDataChannel\"\n              ],\n              effect: Effect.ALLOW,\n              resources: [\"*\"]\n            })\n          ]\n        })\n      },\n      assumedBy: new CompositePrincipal(\n        new ServicePrincipal(\"ecs-tasks.amazonaws.com\")\n      )\n    });\n  }\n\n  addTaskDefinition(props: FargateClusterProps) {\n    this.taskDefinition = new FargateTaskDefinition(\n      this,\n      `${props.serviceName}TaskDefinition`,\n      {\n        cpu: props.cpu || 256,\n        executionRole: this.executionRole,\n        taskRole: new Role(this, `${props.serviceName}TaskRole`, {\n          roleName: `${props.serviceName}TaskRole`,\n          description: `${props.serviceName} Task Role`,\n          inlinePolicies: props.taskRoleInlinePolicies,\n          managedPolicies: props.taskRoleManagedPolicies,\n          assumedBy: new CompositePrincipal(\n            new ServicePrincipal(\"ecs-tasks.amazonaws.com\")\n          )\n        }),\n        memoryLimitMiB: props.memoryLimitMiB || 512\n      }\n    );\n    tagResource(this.taskDefinition, props.tags);\n  }\n\n  addContainerDefinition(props: FargateClusterProps) {\n    this.containerDefinition = this.taskDefinition.addContainer(\n      `${props.serviceName}ContainerDefinition`,\n      {\n        image: this.getImage(props),\n        containerName: props.serviceName,\n        environment: {\n          ...props.containerEnvironment\n        },\n        command: props.containerCommand,\n        secrets: {\n          ...this.secrets\n        },\n        //todo: provide health check options\n        // healthCheck: {\n        //   command: [\n        //     \"CMD-SHELL\",\n        //     `timeout 10s /bin/sh -c ':> /dev/tcp/127.0.0.1/${props.containerPort}' || exit 1`\n        //   ]\n        // },\n        logging: new AwsLogDriver({\n          streamPrefix: `/ecs/${props.clusterName}/${props.serviceName}`,\n          logRetention: 14\n        }),\n        portMappings: props.containerPort\n          ? [{ containerPort: props.containerPort }]\n          : [{ containerPort: 80 }]\n      }\n    );\n    tagResource(this.containerDefinition, props.tags);\n  }\n\n  addFargateService(props: FargateClusterProps) {\n    this.fargateService = new FargateService(\n      this,\n      `${props.serviceName}FargateService`,\n      {\n        circuitBreaker: { rollback: true },\n        cluster: this.cluster,\n        desiredCount: 2,\n        enableECSManagedTags: true,\n        enableExecuteCommand: true,\n        propagateTags: PropagatedTagSource.SERVICE,\n        serviceName: `${props.serviceName}`,\n        taskDefinition: this.taskDefinition\n      }\n    );\n    tagResource(this.fargateService, props.tags);\n  }\n\n  addScalingPolicy(props: FargateClusterProps) {\n    this.scalingPolicy = new TargetTrackingScalingPolicy(\n      this,\n      `${props.serviceName}ScalingPolicy`,\n      {\n        policyName: `${props.serviceName}ScalingPolicy`,\n        scalingTarget: new ScalableTarget(\n          this,\n          `${props.serviceName}scalableTarget`,\n          {\n            maxCapacity: 10,\n            minCapacity: 2,\n            resourceId: `service/${this.cluster.clusterName}/${this.fargateService.serviceName}`,\n            scalableDimension: \"ecs:service:DesiredCount\",\n            serviceNamespace: ServiceNamespace.ECS\n          }\n        ),\n        targetValue: 50,\n        scaleOutCooldown: Duration.seconds(60),\n        scaleInCooldown: Duration.seconds(60),\n        predefinedMetric:\n          props.scalingType == ScalingType.MEMORY\n            ? PredefinedMetric.ECS_SERVICE_AVERAGE_MEMORY_UTILIZATION\n            : PredefinedMetric.ECS_SERVICE_AVERAGE_CPU_UTILIZATION\n      }\n    );\n  }\n\n  registerLoadBalancerTargets(props: FargateClusterProps) {\n    this.fargateService.registerLoadBalancerTargets({\n      containerName: this.containerDefinition.containerName,\n      containerPort: this.containerDefinition.containerPort,\n      newTargetGroupId: `${props.serviceName}TargetGroup`,\n      listener: ListenerConfig.applicationListener(this.loadBalancerListener, {\n        port: props.containerPort,\n        protocol: ApplicationProtocol.HTTP,\n        healthCheck: {\n          interval: Duration.seconds(120),\n          path: props.healthCheckPath || \"/\",\n          port: props.containerPort ? `${props.containerPort}` : \"traffic-port\",\n          timeout: Duration.seconds(10)\n        }\n      })\n    });\n  }\n\n  addLoadBalancer(props: FargateClusterProps) {\n    this.loadBalancer = new ApplicationLoadBalancer(\n      this,\n      `${props.clusterName}LoadBalancer`,\n      {\n        vpc: this.cluster.vpc,\n        internetFacing: true,\n        loadBalancerName: `${props.serviceName}LoadBalancer`,\n        vpcSubnets: {\n          subnetType: SubnetType.PUBLIC\n        }\n      }\n    );\n    tagResource(this.loadBalancer, props.tags);\n  }\n\n  addLoadBalancerListener(props: FargateClusterProps) {\n    if (!!this.certificate) {\n      this.loadBalancerListener = this.loadBalancer.addListener(\n        `${props.serviceName}Listener`,\n        {\n          port: props.protocol == Protocol.HTTP ? 80 : 443,\n          certificates: [this.certificate]\n        }\n      );\n    } else {\n      this.loadBalancerListener = this.loadBalancer.addListener(\n        `${props.serviceName}Listener`,\n        {\n          port: props.protocol == Protocol.HTTP ? 80 : 443\n        }\n      );\n    }\n\n    tagResource(this.loadBalancerListener, props.tags);\n  }\n\n  addHostedZone(props: FargateClusterProps) {\n    if (!props.parentDomain) return;\n\n    this.hostedZone = HostedZone.fromHostedZoneAttributes(this, \"hostedZone\", {\n      hostedZoneId: Fn.importValue(\n        `${props.parentDomain.split(\".\").join(\"\")}HostedZoneId`\n      ),\n      zoneName: props.parentDomain\n    });\n\n    this.certificate = new Certificate(\n      this,\n      `${props.serviceName}Certificate`,\n      {\n        domainName: `${props.serviceName}.${props.clusterName}.${props.parentDomain}`,\n        validation: CertificateValidation.fromDns(this.hostedZone)\n      }\n    );\n\n    this.aRecord = new ARecord(\n      this,\n      `${props.serviceName}.${props.clusterName}.${props.parentDomain}ARecord`,\n      {\n        recordName: `${props.serviceName}.${props.clusterName}.${props.parentDomain}`,\n        zone: this.hostedZone,\n        target: RecordTarget.fromAlias(\n          new LoadBalancerTarget(this.loadBalancer)\n        )\n      }\n    );\n  }\n\n  getImage(props: FargateClusterProps): ContainerImage {\n    if (!props.ecrRepository)\n      return ContainerImage.fromRegistry(\"amazon/amazon-ecs-sample\");\n    if (props.ecrRepository instanceof ContainerImage)\n      return props.ecrRepository;\n    if (props.ecrRepository instanceof Repository) {\n      return ContainerImage.fromEcrRepository(props.ecrRepository, \"latest\");\n    }\n    return ContainerImage.fromRegistry(\"amazon/amazon-ecs-sample\");\n  }\n\n  static build(\n    id: string,\n    props: FargateClusterProps\n  ): (sb: StackBuilder) => Construct {\n    return (sb: StackBuilder) => {\n      const newProps: FargateClusterProps = {\n        ...props,\n        ...{\n          vpc: (sb.getNetwork() as IVpc) || props.vpc\n        }\n      };\n      return new this(sb.getStack(), id, newProps);\n    };\n  }\n}\n"]}
|
|
@@ -18,8 +18,7 @@ class Rds extends constructs_1.Construct {
|
|
|
18
18
|
this.vpc = props.vpc
|
|
19
19
|
? props.vpc
|
|
20
20
|
: new vpc_1.Vpc(this, `${props.databaseName}Vpc`, {
|
|
21
|
-
tags: props.tags
|
|
22
|
-
accountName: aws_cdk_lib_1.Fn.importValue("AccountName")
|
|
21
|
+
tags: props.tags
|
|
23
22
|
});
|
|
24
23
|
}
|
|
25
24
|
addDatabase(props) {
|
|
@@ -77,4 +76,4 @@ class Rds extends constructs_1.Construct {
|
|
|
77
76
|
}
|
|
78
77
|
}
|
|
79
78
|
exports.default = Rds;
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"rdsFreeTier.js","sourceRoot":"","sources":["../../../../../lib/resources/aws/database/rdsFreeTier.ts"],"names":[],"mappings":"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","sourcesContent":["import { Duration, RemovalPolicy, StackProps } from \"aws-cdk-lib\";\nimport {\n  Connections,\n  IConnectable,\n  InstanceClass,\n  InstanceSize,\n  InstanceType,\n  IVpc,\n  SubnetType\n} from \"aws-cdk-lib/aws-ec2\";\nimport {\n  CaCertificate,\n  Credentials,\n  DatabaseInstance,\n  DatabaseInstanceEngine,\n  IInstanceEngine,\n  PostgresEngineVersion,\n  StorageType\n} from \"aws-cdk-lib/aws-rds\";\nimport { Construct } from \"constructs\";\nimport { SecurityGroup } from \"../iam\";\nimport { CustomerManagedKey, Secret } from \"../secrets\";\nimport { KeyValue } from \"../../../types\";\nimport tagResource from \"../../../utils/tagResource\";\nimport { Vpc } from \"../networking/vpc\";\n\ninterface RdsProps extends StackProps {\n  vpc?: Vpc;\n  databaseName?: string;\n  engine?: IInstanceEngine;\n  instanceType?: InstanceType;\n  maxAllocatedStorage?: number;\n  allocatedStorage?: number;\n  backupRetention?: Duration;\n  clusterIdentifier?: string;\n  monitoringInterval?: Duration;\n  preferredMaintenanceWindow?: string;\n  port?: number;\n  enablePerformanceInsights?: boolean;\n  databaseProxy?: boolean;\n  // TODO: The below could be a number, then it scales based on the amount\n  readReplica?: boolean;\n  tags: KeyValue;\n}\n\nexport default class Rds extends Construct implements IConnectable {\n  public connections: Connections;\n  public databaseSecurityGroup: SecurityGroup;\n\n  private databaseCredentials: Secret;\n  private encryptionKey: CustomerManagedKey;\n  // private databaseSecurityGroup: SecurityGroup;\n  private database: DatabaseInstance;\n  private vpc: IVpc;\n\n  constructor(scope: Construct, id: string, props: RdsProps) {\n    super(scope, id);\n    this.addVpc(props);\n    this.addDatabase(props);\n  }\n\n  addVpc(props: RdsProps) {\n    this.vpc = props.vpc\n      ? props.vpc\n      : new Vpc(this, `${props.databaseName}Vpc`, {\n          tags: props.tags\n        });\n  }\n  addDatabase(props: RdsProps) {\n    // Database Credentials\n    this.databaseCredentials = new Secret(\n      this,\n      `${props.databaseName}Credentials`,\n      {\n        secretName: `${props.databaseName}Credentials`,\n        generateSecretString: {\n          secretStringTemplate: JSON.stringify({\n            username: \"postgres\"\n          }),\n          excludePunctuation: true,\n          includeSpace: false,\n          generateStringKey: \"password\"\n        },\n        tags: props.tags\n      }\n    );\n\n    // Customer Managed Keys\n    this.encryptionKey = new CustomerManagedKey(\n      this,\n      `${props.databaseName}ClusterEncryptionKey`,\n      {\n        aliasName: `cmk/rds/${props.databaseName}/encryptionKey`,\n        tags: props.tags\n      }\n    );\n\n    this.databaseSecurityGroup = new SecurityGroup(\n      this,\n      `${props.databaseName}SecurityGroup`,\n      {\n        vpc: this.vpc,\n        description: `Security group that allows inbound access to the postgres cluster for ${props.databaseName}`\n      }\n    );\n\n    // Database Cluster\n    this.database = new DatabaseInstance(\n      this,\n      `${props.databaseName}Database`,\n      {\n        vpc: this.vpc,\n        vpcSubnets: {\n          subnetType: SubnetType.PRIVATE_WITH_EGRESS\n        },\n        securityGroups: [this.databaseSecurityGroup],\n        engine:\n          props.engine ||\n          DatabaseInstanceEngine.postgres({\n            version: PostgresEngineVersion.VER_16_3\n          }),\n        allocatedStorage: props.allocatedStorage,\n        backupRetention: props.backupRetention || Duration.days(14),\n        storageEncrypted: true,\n        storageEncryptionKey: this.encryptionKey.key,\n        storageType: StorageType.GP3,\n        caCertificate: CaCertificate.RDS_CA_RSA4096_G1,\n        removalPolicy: RemovalPolicy.SNAPSHOT,\n        deleteAutomatedBackups: false,\n        databaseName:\n          props.databaseName || `${this.node.id.replace(\"Rds\", \"\")}`,\n        instanceIdentifier: props.databaseName,\n        instanceType:\n          props.instanceType ||\n          InstanceType.of(InstanceClass.BURSTABLE3, InstanceSize.MICRO),\n        multiAz: false,\n        port: props.port,\n        preferredMaintenanceWindow:\n          props.preferredMaintenanceWindow || \"Sat:12:30-Sat:20:30\",\n        credentials: Credentials.fromSecret(this.databaseCredentials.secret)\n      }\n    );\n    tagResource(this.database, props.tags);\n  }\n}\n"]}
|
|
@@ -7,7 +7,6 @@ const aws_ec2_1 = require("aws-cdk-lib/aws-ec2");
|
|
|
7
7
|
const getCidr_1 = require("../../../utils/getCidr");
|
|
8
8
|
const resourceShare_1 = require("../utilities/resourceShare");
|
|
9
9
|
const getAccountId_1 = require("../../../utils/getAccountId");
|
|
10
|
-
const stripAndCamelCase_1 = require("../../../utils/stripAndCamelCase");
|
|
11
10
|
class IpamPool extends constructs_1.Construct {
|
|
12
11
|
constructor(scope, id, props) {
|
|
13
12
|
super(scope, id);
|
|
@@ -20,7 +19,7 @@ class IpamPool extends constructs_1.Construct {
|
|
|
20
19
|
const cidrBlock = new getCidr_1.default();
|
|
21
20
|
const freeCidrBlock = cidrBlock.getCidrBlock();
|
|
22
21
|
cidrBlock.updateState(freeCidrBlock, false);
|
|
23
|
-
const
|
|
22
|
+
const accountId = (0, getAccountId_1.default)(account);
|
|
24
23
|
const ipamPool = new aws_ec2_1.CfnIPAMPool(this, `${account}IpamPool${freeCidrBlock}`, {
|
|
25
24
|
description: `${account} - IPAM pool - ${region} - ${freeCidrBlock}`,
|
|
26
25
|
addressFamily: "ipv4",
|
|
@@ -29,7 +28,7 @@ class IpamPool extends constructs_1.Construct {
|
|
|
29
28
|
allocationResourceTags: [
|
|
30
29
|
{
|
|
31
30
|
key: "fjall:operations:pool",
|
|
32
|
-
value: `${
|
|
31
|
+
value: `${accountId}`
|
|
33
32
|
}
|
|
34
33
|
],
|
|
35
34
|
autoImport: true,
|
|
@@ -40,7 +39,7 @@ class IpamPool extends constructs_1.Construct {
|
|
|
40
39
|
value: "top-level"
|
|
41
40
|
},
|
|
42
41
|
{
|
|
43
|
-
key: "fjall:costAllocation:
|
|
42
|
+
key: "fjall:costAllocation:accountName",
|
|
44
43
|
value: `${account}`
|
|
45
44
|
}
|
|
46
45
|
]
|
|
@@ -49,7 +48,7 @@ class IpamPool extends constructs_1.Construct {
|
|
|
49
48
|
name: `${account}IpamResourceShare.${region}`,
|
|
50
49
|
allowExternalPrincipals: false,
|
|
51
50
|
// TODO: getAccountId expects environment as argument
|
|
52
|
-
principals: [
|
|
51
|
+
principals: [accountId],
|
|
53
52
|
resourceArns: [ipamPool.attrArn],
|
|
54
53
|
tags: [
|
|
55
54
|
{
|
|
@@ -58,15 +57,15 @@ class IpamPool extends constructs_1.Construct {
|
|
|
58
57
|
}
|
|
59
58
|
]
|
|
60
59
|
});
|
|
61
|
-
new aws_cdk_lib_1.CfnOutput(this,
|
|
62
|
-
key:
|
|
60
|
+
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolId${accountId}`, {
|
|
61
|
+
key: `IpamPoolId${accountId}`,
|
|
63
62
|
value: ipamPool.attrIpamPoolId,
|
|
64
|
-
exportName:
|
|
63
|
+
exportName: `IpamPoolId${accountId}`
|
|
65
64
|
});
|
|
66
|
-
new aws_cdk_lib_1.CfnOutput(this,
|
|
67
|
-
key:
|
|
65
|
+
new aws_cdk_lib_1.CfnOutput(this, `IpamPoolArn${accountId}`, {
|
|
66
|
+
key: `IpamPoolArn${accountId}`,
|
|
68
67
|
value: ipamPool.attrArn,
|
|
69
|
-
exportName:
|
|
68
|
+
exportName: `IpamPoolArn${accountId}`
|
|
70
69
|
});
|
|
71
70
|
}
|
|
72
71
|
}
|
|
@@ -82,4 +81,4 @@ class IpamPoolStack extends aws_cdk_lib_1.Stack {
|
|
|
82
81
|
}
|
|
83
82
|
}
|
|
84
83
|
exports.IpamPoolStack = IpamPoolStack;
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
84
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaXBhbVBvb2wuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9saWIvcmVzb3VyY2VzL2F3cy9uZXR3b3JraW5nL2lwYW1Qb29sLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDZDQUErRDtBQUMvRCwyQ0FBdUM7QUFDdkMsaURBQW1FO0FBQ25FLG9EQUErQztBQUMvQyw4REFBMkQ7QUFDM0QsOERBQXVEO0FBYXZELE1BQWEsUUFBUyxTQUFRLHNCQUFTO0lBQ3JDLFlBQVksS0FBZ0IsRUFBRSxFQUFVLEVBQUUsS0FBb0I7UUFDNUQsS0FBSyxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQztRQUVqQiwwREFBMEQ7UUFDMUQsTUFBTSx5QkFBeUIsR0FDN0IsS0FBSyxDQUFDLFNBQVMsSUFBSSxnQkFBRSxDQUFDLFdBQVcsQ0FBQywyQkFBMkIsQ0FBQyxDQUFDO1FBQ2pFLDhDQUE4QztRQUM5QyxNQUFNLE1BQU0sR0FBRyxLQUFLLENBQUMsTUFBTSxDQUFDO1FBRTVCLE1BQU0sb0JBQW9CLEdBQUcsS0FBSyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUM3RCxPQUFPLENBQUMsV0FBVyxFQUFFLENBQ3RCLENBQUM7UUFFRixLQUFLLE1BQU0sT0FBTyxJQUFJLG9CQUFvQixFQUFFO1lBQzFDLE1BQU0sU0FBUyxHQUFHLElBQUksaUJBQVMsRUFBRSxDQUFDO1lBQ2xDLE1BQU0sYUFBYSxHQUFHLFNBQVMsQ0FBQyxZQUFZLEVBQUUsQ0FBQztZQUMvQyxTQUFTLENBQUMsV0FBVyxDQUFDLGFBQWEsRUFBRSxLQUFLLENBQUMsQ0FBQztZQUU1QyxNQUFNLFNBQVMsR0FBRyxJQUFBLHNCQUFZLEVBQUMsT0FBTyxDQUFDLENBQUM7WUFFeEMsTUFBTSxRQUFRLEdBQUcsSUFBSSxxQkFBYSxDQUNoQyxJQUFJLEVBQ0osR0FBRyxPQUFPLFdBQVcsYUFBYSxFQUFFLEVBQ3BDO2dCQUNFLFdBQVcsRUFBRSxHQUFHLE9BQU8sa0JBQWtCLE1BQU0sTUFBTSxhQUFhLEVBQUU7Z0JBQ3BFLGFBQWEsRUFBRSxNQUFNO2dCQUNyQixXQUFXLEVBQUUseUJBQXlCO2dCQUN0QyxNQUFNLEVBQUUsTUFBTTtnQkFDZCxzQkFBc0IsRUFBRTtvQkFDdEI7d0JBQ0UsR0FBRyxFQUFFLHVCQUF1Qjt3QkFDNUIsS0FBSyxFQUFFLEdBQUcsU0FBUyxFQUFFO3FCQUN0QjtpQkFDRjtnQkFDRCxVQUFVLEVBQUUsSUFBSTtnQkFDaEIsZ0JBQWdCLEVBQUUsQ0FBQyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsQ0FBQztnQkFDM0MsSUFBSSxFQUFFO29CQUNKO3dCQUNFLEdBQUcsRUFBRSx1QkFBdUI7d0JBQzVCLEtBQUssRUFBRSxXQUFXO3FCQUNuQjtvQkFDRDt3QkFDRSxHQUFHLEVBQUUsa0NBQWtDO3dCQUN2QyxLQUFLLEVBQUUsR0FBRyxPQUFPLEVBQUU7cUJBQ3BCO2lCQUNGO2FBQ0YsQ0FDRixDQUFDO1lBRUYsSUFBSSw2QkFBYSxDQUFDLElBQUksRUFBRSxHQUFHLE9BQU8sR0FBRyxNQUFNLG1CQUFtQixFQUFFO2dCQUM5RCxJQUFJLEVBQUUsR0FBRyxPQUFPLHFCQUFxQixNQUFNLEVBQUU7Z0JBQzdDLHVCQUF1QixFQUFFLEtBQUs7Z0JBQzlCLHFEQUFxRDtnQkFDckQsVUFBVSxFQUFFLENBQUMsU0FBUyxDQUFDO2dCQUN2QixZQUFZLEVBQUUsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDO2dCQUNoQyxJQUFJLEVBQUU7b0JBQ0o7d0JBQ0UsR0FBRyxFQUFFLDhCQUE4Qjt3QkFDbkMsS0FBSyxFQUFFLEdBQUcsT0FBTyxFQUFFO3FCQUNwQjtpQkFDRjthQUNGLENBQUMsQ0FBQztZQUVILElBQUksdUJBQVMsQ0FBQyxJQUFJLEVBQUUsYUFBYSxTQUFTLEVBQUUsRUFBRTtnQkFDNUMsR0FBRyxFQUFFLGFBQWEsU0FBUyxFQUFFO2dCQUM3QixLQUFLLEVBQUUsUUFBUSxDQUFDLGNBQWM7Z0JBQzlCLFVBQVUsRUFBRSxhQUFhLFNBQVMsRUFBRTthQUNyQyxDQUFDLENBQUM7WUFFSCxJQUFJLHVCQUFTLENBQUMsSUFBSSxFQUFFLGNBQWMsU0FBUyxFQUFFLEVBQUU7Z0JBQzdDLEdBQUcsRUFBRSxjQUFjLFNBQVMsRUFBRTtnQkFDOUIsS0FBSyxFQUFFLFFBQVEsQ0FBQyxPQUFPO2dCQUN2QixVQUFVLEVBQUUsY0FBYyxTQUFTLEVBQUU7YUFDdEMsQ0FBQyxDQUFDO1NBQ0o7SUFDSCxDQUFDO0NBQ0Y7QUE3RUQsNEJBNkVDO0FBRUQsTUFBYSxhQUFjLFNBQVEsbUJBQUs7SUFDdEMsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUF5QjtRQUNqRSxLQUFLLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1FBRWpCLElBQUksUUFBUSxDQUFDLElBQUksRUFBRSxVQUFVLEVBQUU7WUFDN0IsV0FBVyxFQUFFLEtBQUssQ0FBQyxXQUFXO1lBQzlCLE1BQU0sRUFBRSxLQUFLLENBQUMsTUFBTTtTQUNyQixDQUFDLENBQUM7SUFDTCxDQUFDO0NBQ0Y7QUFURCxzQ0FTQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEZuLCBDZm5PdXRwdXQsIFN0YWNrUHJvcHMsIFN0YWNrIH0gZnJvbSBcImF3cy1jZGstbGliXCI7XG5pbXBvcnQgeyBDb25zdHJ1Y3QgfSBmcm9tIFwiY29uc3RydWN0c1wiO1xuaW1wb3J0IHsgQ2ZuSVBBTVBvb2wgYXMgSXBhbVBvb2xDbGFzcyB9IGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5pbXBvcnQgQ2lkckJsb2NrIGZyb20gXCIuLi8uLi8uLi91dGlscy9nZXRDaWRyXCI7XG5pbXBvcnQgeyBSZXNvdXJjZVNoYXJlIH0gZnJvbSBcIi4uL3V0aWxpdGllcy9yZXNvdXJjZVNoYXJlXCI7XG5pbXBvcnQgZ2V0QWNjb3VudElkIGZyb20gXCIuLi8uLi8uLi91dGlscy9nZXRBY2NvdW50SWRcIjtcblxuZXhwb3J0IGludGVyZmFjZSBJcGFtUG9vbFByb3BzIGV4dGVuZHMgU3RhY2tQcm9wcyB7XG4gIG9yZ0FjY291bnRzOiBzdHJpbmdbXTtcbiAgaXBhbVNjb3BlPzogc3RyaW5nO1xuICByZWdpb246IHN0cmluZztcbn1cblxuaW50ZXJmYWNlIElwYW1Qb29sU3RhY2tQcm9wcyBleHRlbmRzIFN0YWNrUHJvcHMge1xuICBvcmdBY2NvdW50czogc3RyaW5nW107XG4gIHJlZ2lvbjogc3RyaW5nO1xufVxuXG5leHBvcnQgY2xhc3MgSXBhbVBvb2wgZXh0ZW5kcyBDb25zdHJ1Y3Qge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSXBhbVBvb2xQcm9wcykge1xuICAgIHN1cGVyKHNjb3BlLCBpZCk7XG5cbiAgICAvLyBHZXQgdGhlIGRlZmF1bHQgSVBBTSBzY29wZSBJRCBmcm9tIHByb3BzLCBvciBDRk4gaW1wb3J0XG4gICAgY29uc3QgSXBhbVByaXZhdGVEZWZhdWx0U2NvcGVJZCA9XG4gICAgICBwcm9wcy5pcGFtU2NvcGUgfHwgRm4uaW1wb3J0VmFsdWUoXCJJcGFtUHJpdmF0ZURlZmF1bHRTY29wZUlkXCIpO1xuICAgIC8vIFByaW9yaXRpc2UgcmVnaW9uIGZyb20gcHJvcHMsIHRoZW4gZnJvbSBlbnZcbiAgICBjb25zdCByZWdpb24gPSBwcm9wcy5yZWdpb247XG5cbiAgICBjb25zdCBvcmdhbmlzYXRpb25BY2NvdW50cyA9IHByb3BzLm9yZ0FjY291bnRzLm1hcCgoYWNjb3VudCkgPT5cbiAgICAgIGFjY291bnQudG9Mb3dlckNhc2UoKVxuICAgICk7XG5cbiAgICBmb3IgKGNvbnN0IGFjY291bnQgb2Ygb3JnYW5pc2F0aW9uQWNjb3VudHMpIHtcbiAgICAgIGNvbnN0IGNpZHJCbG9jayA9IG5ldyBDaWRyQmxvY2soKTtcbiAgICAgIGNvbnN0IGZyZWVDaWRyQmxvY2sgPSBjaWRyQmxvY2suZ2V0Q2lkckJsb2NrKCk7XG4gICAgICBjaWRyQmxvY2sudXBkYXRlU3RhdGUoZnJlZUNpZHJCbG9jaywgZmFsc2UpO1xuXG4gICAgICBjb25zdCBhY2NvdW50SWQgPSBnZXRBY2NvdW50SWQoYWNjb3VudCk7XG5cbiAgICAgIGNvbnN0IGlwYW1Qb29sID0gbmV3IElwYW1Qb29sQ2xhc3MoXG4gICAgICAgIHRoaXMsXG4gICAgICAgIGAke2FjY291bnR9SXBhbVBvb2wke2ZyZWVDaWRyQmxvY2t9YCxcbiAgICAgICAge1xuICAgICAgICAgIGRlc2NyaXB0aW9uOiBgJHthY2NvdW50fSAtIElQQU0gcG9vbCAtICR7cmVnaW9ufSAtICR7ZnJlZUNpZHJCbG9ja31gLFxuICAgICAgICAgIGFkZHJlc3NGYW1pbHk6IFwiaXB2NFwiLFxuICAgICAgICAgIGlwYW1TY29wZUlkOiBJcGFtUHJpdmF0ZURlZmF1bHRTY29wZUlkLFxuICAgICAgICAgIGxvY2FsZTogcmVnaW9uLFxuICAgICAgICAgIGFsbG9jYXRpb25SZXNvdXJjZVRhZ3M6IFtcbiAgICAgICAgICAgIHtcbiAgICAgICAgICAgICAga2V5OiBcImZqYWxsOm9wZXJhdGlvbnM6cG9vbFwiLFxuICAgICAgICAgICAgICB2YWx1ZTogYCR7YWNjb3VudElkfWBcbiAgICAgICAgICAgIH1cbiAgICAgICAgICBdLFxuICAgICAgICAgIGF1dG9JbXBvcnQ6IHRydWUsXG4gICAgICAgICAgcHJvdmlzaW9uZWRDaWRyczogW3sgY2lkcjogZnJlZUNpZHJCbG9jayB9XSxcbiAgICAgICAgICB0YWdzOiBbXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgIGtleTogXCJmamFsbDpvcGVyYXRpb25zOnBvb2xcIixcbiAgICAgICAgICAgICAgdmFsdWU6IFwidG9wLWxldmVsXCJcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgICB7XG4gICAgICAgICAgICAgIGtleTogXCJmamFsbDpjb3N0QWxsb2NhdGlvbjphY2NvdW50TmFtZVwiLFxuICAgICAgICAgICAgICB2YWx1ZTogYCR7YWNjb3VudH1gXG4gICAgICAgICAgICB9XG4gICAgICAgICAgXVxuICAgICAgICB9XG4gICAgICApO1xuXG4gICAgICBuZXcgUmVzb3VyY2VTaGFyZSh0aGlzLCBgJHthY2NvdW50fSR7cmVnaW9ufUlwYW1SZXNvdXJjZVNoYXJlYCwge1xuICAgICAgICBuYW1lOiBgJHthY2NvdW50fUlwYW1SZXNvdXJjZVNoYXJlLiR7cmVnaW9ufWAsXG4gICAgICAgIGFsbG93RXh0ZXJuYWxQcmluY2lwYWxzOiBmYWxzZSxcbiAgICAgICAgLy8gVE9ETzogZ2V0QWNjb3VudElkIGV4cGVjdHMgZW52aXJvbm1lbnQgYXMgYXJndW1lbnRcbiAgICAgICAgcHJpbmNpcGFsczogW2FjY291bnRJZF0sXG4gICAgICAgIHJlc291cmNlQXJuczogW2lwYW1Qb29sLmF0dHJBcm5dLFxuICAgICAgICB0YWdzOiBbXG4gICAgICAgICAge1xuICAgICAgICAgICAga2V5OiBcImZqYWxsOmNvc3RBbGxvY2F0aW9uOmFjY291bnRcIixcbiAgICAgICAgICAgIHZhbHVlOiBgJHthY2NvdW50fWBcbiAgICAgICAgICB9XG4gICAgICAgIF1cbiAgICAgIH0pO1xuXG4gICAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIGBJcGFtUG9vbElkJHthY2NvdW50SWR9YCwge1xuICAgICAgICBrZXk6IGBJcGFtUG9vbElkJHthY2NvdW50SWR9YCxcbiAgICAgICAgdmFsdWU6IGlwYW1Qb29sLmF0dHJJcGFtUG9vbElkLFxuICAgICAgICBleHBvcnROYW1lOiBgSXBhbVBvb2xJZCR7YWNjb3VudElkfWBcbiAgICAgIH0pO1xuXG4gICAgICBuZXcgQ2ZuT3V0cHV0KHRoaXMsIGBJcGFtUG9vbEFybiR7YWNjb3VudElkfWAsIHtcbiAgICAgICAga2V5OiBgSXBhbVBvb2xBcm4ke2FjY291bnRJZH1gLFxuICAgICAgICB2YWx1ZTogaXBhbVBvb2wuYXR0ckFybixcbiAgICAgICAgZXhwb3J0TmFtZTogYElwYW1Qb29sQXJuJHthY2NvdW50SWR9YFxuICAgICAgfSk7XG4gICAgfVxuICB9XG59XG5cbmV4cG9ydCBjbGFzcyBJcGFtUG9vbFN0YWNrIGV4dGVuZHMgU3RhY2sge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wczogSXBhbVBvb2xTdGFja1Byb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGlkKTtcblxuICAgIG5ldyBJcGFtUG9vbCh0aGlzLCBcIklwYW1Qb29sXCIsIHtcbiAgICAgIG9yZ0FjY291bnRzOiBwcm9wcy5vcmdBY2NvdW50cyxcbiAgICAgIHJlZ2lvbjogcHJvcHMucmVnaW9uXG4gICAgfSk7XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,8 +3,8 @@ import * as ec2 from "aws-cdk-lib/aws-ec2";
|
|
|
3
3
|
import { StackBuilder } from "../awsStack";
|
|
4
4
|
import { KeyValue } from "../../../types";
|
|
5
5
|
interface VpcProps extends ec2.VpcProps {
|
|
6
|
-
accountName?: string;
|
|
7
6
|
region?: string;
|
|
7
|
+
accountId?: string;
|
|
8
8
|
availabilityZones?: string[];
|
|
9
9
|
ipv4IpamPoolId?: string;
|
|
10
10
|
tags: KeyValue;
|
|
@@ -12,7 +12,12 @@ interface VpcProps extends ec2.VpcProps {
|
|
|
12
12
|
export declare class Vpc extends ec2.Vpc {
|
|
13
13
|
constructor(scope: Construct, id: string, props?: VpcProps);
|
|
14
14
|
static availabilityZones(scope: Construct): string[];
|
|
15
|
-
static
|
|
15
|
+
static flowLogs(scope: Construct, id: string, props?: VpcProps): {
|
|
16
|
+
[x: string]: {
|
|
17
|
+
destination: ec2.FlowLogDestination;
|
|
18
|
+
};
|
|
19
|
+
} | undefined;
|
|
20
|
+
static ipAddresses(scope: Construct, id: string, props?: VpcProps): ec2.IIpAddresses | undefined;
|
|
16
21
|
static build(id: string, props?: VpcProps): (sb: StackBuilder) => Construct;
|
|
17
22
|
/**
|
|
18
23
|
* Imports a pre-existing VPC Resource into your Stack
|
|
@@ -4,37 +4,41 @@ exports.Vpc = void 0;
|
|
|
4
4
|
const aws_cdk_lib_1 = require("aws-cdk-lib");
|
|
5
5
|
const ec2 = require("aws-cdk-lib/aws-ec2");
|
|
6
6
|
const logGroup_1 = require("../logging/logGroup");
|
|
7
|
-
const stripAndCamelCase_1 = require("../../../utils/stripAndCamelCase");
|
|
8
7
|
class Vpc extends ec2.Vpc {
|
|
9
8
|
constructor(scope, id, props) {
|
|
10
9
|
super(scope, `vpc-${id}`, {
|
|
11
10
|
...props,
|
|
12
11
|
vpcName: `vpc-${id}`,
|
|
13
12
|
availabilityZones: Vpc.availabilityZones(scope),
|
|
14
|
-
flowLogs:
|
|
15
|
-
|
|
16
|
-
destination: ec2.FlowLogDestination.toCloudWatchLogs(new logGroup_1.LogGroup(scope, `${id}FlowLogGroup`, {
|
|
17
|
-
logGroupName: `/vpc/flowlogs/vpc-${id}/`,
|
|
18
|
-
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY
|
|
19
|
-
}))
|
|
20
|
-
}
|
|
21
|
-
},
|
|
22
|
-
ipAddresses: Vpc.ipAddresses(scope, props)
|
|
13
|
+
flowLogs: Vpc.flowLogs(scope, id, props),
|
|
14
|
+
ipAddresses: Vpc.ipAddresses(scope, id, props)
|
|
23
15
|
});
|
|
24
|
-
|
|
25
|
-
|
|
16
|
+
if (!!props?.accountId) {
|
|
17
|
+
// Required for the VPC to use the IPAM Pool to provsion IP addresses
|
|
18
|
+
aws_cdk_lib_1.Tags.of(this).add("fjall:operations:pool", props?.accountId || "noPool");
|
|
19
|
+
}
|
|
26
20
|
}
|
|
27
21
|
static availabilityZones(scope) {
|
|
28
22
|
return aws_cdk_lib_1.Stack.of(scope).availabilityZones.slice(0, 3);
|
|
29
23
|
}
|
|
30
|
-
static
|
|
31
|
-
|
|
32
|
-
aws_cdk_lib_1.Fn.importValue(`${(0, stripAndCamelCase_1.stripAndCamelCase)(props?.accountName || "noPool")}IpamPoolId`);
|
|
33
|
-
// Default to unspecified ipAddresses if unable to read from stack output
|
|
34
|
-
if (!ipv4IpamPoolId)
|
|
24
|
+
static flowLogs(scope, id, props) {
|
|
25
|
+
if (!props || !props.accountId)
|
|
35
26
|
return undefined;
|
|
27
|
+
return {
|
|
28
|
+
[`${id}VpcFlowLogs`]: {
|
|
29
|
+
destination: ec2.FlowLogDestination.toCloudWatchLogs(new logGroup_1.LogGroup(scope, `${id}FlowLogGroup`, {
|
|
30
|
+
logGroupName: `/vpc/flowlogs/vpc-${id}/`,
|
|
31
|
+
removalPolicy: aws_cdk_lib_1.RemovalPolicy.DESTROY
|
|
32
|
+
}))
|
|
33
|
+
}
|
|
34
|
+
};
|
|
35
|
+
}
|
|
36
|
+
static ipAddresses(scope, id, props) {
|
|
37
|
+
if (!props?.accountId || !props?.ipv4IpamPoolId) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
36
40
|
return ec2.IpAddresses.awsIpamAllocation({
|
|
37
|
-
ipv4IpamPoolId: ipv4IpamPoolId,
|
|
41
|
+
ipv4IpamPoolId: props.ipv4IpamPoolId,
|
|
38
42
|
ipv4NetmaskLength: 20,
|
|
39
43
|
defaultSubnetIpv4NetmaskLength: 23
|
|
40
44
|
});
|
|
@@ -63,4 +67,4 @@ class Vpc extends ec2.Vpc {
|
|
|
63
67
|
}
|
|
64
68
|
}
|
|
65
69
|
exports.Vpc = Vpc;
|
|
66
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
70
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidnBjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vbGliL3Jlc291cmNlcy9hd3MvbmV0d29ya2luZy92cGMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQ0EsNkNBQXlEO0FBQ3pELDJDQUEyQztBQUczQyxrREFBK0M7QUFXL0MsTUFBYSxHQUFJLFNBQVEsR0FBRyxDQUFDLEdBQUc7SUFDOUIsWUFBWSxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQjtRQUN4RCxLQUFLLENBQUMsS0FBSyxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUU7WUFDeEIsR0FBRyxLQUFLO1lBQ1IsT0FBTyxFQUFFLE9BQU8sRUFBRSxFQUFFO1lBQ3BCLGlCQUFpQixFQUFFLEdBQUcsQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUM7WUFDL0MsUUFBUSxFQUFFLEdBQUcsQ0FBQyxRQUFRLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7WUFDeEMsV0FBVyxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSyxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUM7U0FDL0MsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLFNBQVMsRUFBRTtZQUN0QixxRUFBcUU7WUFDckUsa0JBQUksQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsR0FBRyxDQUFDLHVCQUF1QixFQUFFLEtBQUssRUFBRSxTQUFTLElBQUksUUFBUSxDQUFDLENBQUM7U0FDMUU7SUFDSCxDQUFDO0lBRUQsTUFBTSxDQUFDLGlCQUFpQixDQUFDLEtBQWdCO1FBQ3ZDLE9BQU8sbUJBQUssQ0FBQyxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQztJQUN2RCxDQUFDO0lBRUQsTUFBTSxDQUFDLFFBQVEsQ0FBQyxLQUFnQixFQUFFLEVBQVUsRUFBRSxLQUFnQjtRQUM1RCxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsS0FBSyxDQUFDLFNBQVM7WUFBRSxPQUFPLFNBQVMsQ0FBQztRQUVqRCxPQUFPO1lBQ0wsQ0FBQyxHQUFHLEVBQUUsYUFBYSxDQUFDLEVBQUU7Z0JBQ3BCLFdBQVcsRUFBRSxHQUFHLENBQUMsa0JBQWtCLENBQUMsZ0JBQWdCLENBQ2xELElBQUksbUJBQVEsQ0FBQyxLQUFLLEVBQUUsR0FBRyxFQUFFLGNBQWMsRUFBRTtvQkFDdkMsWUFBWSxFQUFFLHFCQUFxQixFQUFFLEdBQUc7b0JBQ3hDLGFBQWEsRUFBRSwyQkFBYSxDQUFDLE9BQU87aUJBQ3JDLENBQUMsQ0FDSDthQUNGO1NBQ0YsQ0FBQztJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsV0FBVyxDQUFDLEtBQWdCLEVBQUUsRUFBVSxFQUFFLEtBQWdCO1FBQy9ELElBQUksQ0FBQyxLQUFLLEVBQUUsU0FBUyxJQUFJLENBQUMsS0FBSyxFQUFFLGNBQWMsRUFBRTtZQUMvQyxPQUFPLFNBQVMsQ0FBQztTQUNsQjtRQUVELE9BQU8sR0FBRyxDQUFDLFdBQVcsQ0FBQyxpQkFBaUIsQ0FBQztZQUN2QyxjQUFjLEVBQUUsS0FBSyxDQUFDLGNBQWM7WUFDcEMsaUJBQWlCLEVBQUUsRUFBRTtZQUNyQiw4QkFBOEIsRUFBRSxFQUFFO1NBQ25DLENBQUMsQ0FBQztJQUNMLENBQUM7SUFFRCxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQVUsRUFBRSxLQUFnQjtRQUN2QyxPQUFPLENBQUMsRUFBZ0IsRUFBRSxFQUFFO1lBQzFCLE9BQU8sSUFBSSxJQUFJLENBQUMsRUFBRSxDQUFDLFFBQVEsRUFBRSxFQUFFLEVBQUUsRUFBRSxLQUFLLENBQUMsQ0FBQztRQUM1QyxDQUFDLENBQUM7SUFDSixDQUFDO0lBQ0Q7Ozs7Ozs7OztPQVNHO0lBQ0gsTUFBTSxDQUFDLE1BQU0sQ0FDWCxFQUFVLEVBQ1YsWUFBb0I7UUFFcEIsT0FBTyxDQUFDLEVBQWdCLEVBQUUsRUFBRTtZQUMxQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsRUFBRSxFQUFFLEVBQUU7Z0JBQzNDLE9BQU8sRUFBRSxHQUFHLFlBQVksSUFBSSxFQUFFLEVBQUU7YUFDakMsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNGO0FBeEVELGtCQXdFQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENvbnN0cnVjdCB9IGZyb20gXCJjb25zdHJ1Y3RzXCI7XG5pbXBvcnQgeyBUYWdzLCBSZW1vdmFsUG9saWN5LCBTdGFjayB9IGZyb20gXCJhd3MtY2RrLWxpYlwiO1xuaW1wb3J0ICogYXMgZWMyIGZyb20gXCJhd3MtY2RrLWxpYi9hd3MtZWMyXCI7XG5cbmltcG9ydCB7IFN0YWNrQnVpbGRlciB9IGZyb20gXCIuLi9hd3NTdGFja1wiO1xuaW1wb3J0IHsgTG9nR3JvdXAgfSBmcm9tIFwiLi4vbG9nZ2luZy9sb2dHcm91cFwiO1xuaW1wb3J0IHsgS2V5VmFsdWUgfSBmcm9tIFwiLi4vLi4vLi4vdHlwZXNcIjtcblxuaW50ZXJmYWNlIFZwY1Byb3BzIGV4dGVuZHMgZWMyLlZwY1Byb3BzIHtcbiAgcmVnaW9uPzogc3RyaW5nO1xuICBhY2NvdW50SWQ/OiBzdHJpbmc7XG4gIGF2YWlsYWJpbGl0eVpvbmVzPzogc3RyaW5nW107XG4gIGlwdjRJcGFtUG9vbElkPzogc3RyaW5nO1xuICB0YWdzOiBLZXlWYWx1ZTtcbn1cblxuZXhwb3J0IGNsYXNzIFZwYyBleHRlbmRzIGVjMi5WcGMge1xuICBjb25zdHJ1Y3RvcihzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IFZwY1Byb3BzKSB7XG4gICAgc3VwZXIoc2NvcGUsIGB2cGMtJHtpZH1gLCB7XG4gICAgICAuLi5wcm9wcyxcbiAgICAgIHZwY05hbWU6IGB2cGMtJHtpZH1gLFxuICAgICAgYXZhaWxhYmlsaXR5Wm9uZXM6IFZwYy5hdmFpbGFiaWxpdHlab25lcyhzY29wZSksXG4gICAgICBmbG93TG9nczogVnBjLmZsb3dMb2dzKHNjb3BlLCBpZCwgcHJvcHMpLFxuICAgICAgaXBBZGRyZXNzZXM6IFZwYy5pcEFkZHJlc3NlcyhzY29wZSwgaWQsIHByb3BzKVxuICAgIH0pO1xuXG4gICAgaWYgKCEhcHJvcHM/LmFjY291bnRJZCkge1xuICAgICAgLy8gUmVxdWlyZWQgZm9yIHRoZSBWUEMgdG8gdXNlIHRoZSBJUEFNIFBvb2wgdG8gcHJvdnNpb24gSVAgYWRkcmVzc2VzXG4gICAgICBUYWdzLm9mKHRoaXMpLmFkZChcImZqYWxsOm9wZXJhdGlvbnM6cG9vbFwiLCBwcm9wcz8uYWNjb3VudElkIHx8IFwibm9Qb29sXCIpO1xuICAgIH1cbiAgfVxuXG4gIHN0YXRpYyBhdmFpbGFiaWxpdHlab25lcyhzY29wZTogQ29uc3RydWN0KSB7XG4gICAgcmV0dXJuIFN0YWNrLm9mKHNjb3BlKS5hdmFpbGFiaWxpdHlab25lcy5zbGljZSgwLCAzKTtcbiAgfVxuXG4gIHN0YXRpYyBmbG93TG9ncyhzY29wZTogQ29uc3RydWN0LCBpZDogc3RyaW5nLCBwcm9wcz86IFZwY1Byb3BzKSB7XG4gICAgaWYgKCFwcm9wcyB8fCAhcHJvcHMuYWNjb3VudElkKSByZXR1cm4gdW5kZWZpbmVkO1xuXG4gICAgcmV0dXJuIHtcbiAgICAgIFtgJHtpZH1WcGNGbG93TG9nc2BdOiB7XG4gICAgICAgIGRlc3RpbmF0aW9uOiBlYzIuRmxvd0xvZ0Rlc3RpbmF0aW9uLnRvQ2xvdWRXYXRjaExvZ3MoXG4gICAgICAgICAgbmV3IExvZ0dyb3VwKHNjb3BlLCBgJHtpZH1GbG93TG9nR3JvdXBgLCB7XG4gICAgICAgICAgICBsb2dHcm91cE5hbWU6IGAvdnBjL2Zsb3dsb2dzL3ZwYy0ke2lkfS9gLFxuICAgICAgICAgICAgcmVtb3ZhbFBvbGljeTogUmVtb3ZhbFBvbGljeS5ERVNUUk9ZXG4gICAgICAgICAgfSlcbiAgICAgICAgKVxuICAgICAgfVxuICAgIH07XG4gIH1cblxuICBzdGF0aWMgaXBBZGRyZXNzZXMoc2NvcGU6IENvbnN0cnVjdCwgaWQ6IHN0cmluZywgcHJvcHM/OiBWcGNQcm9wcykge1xuICAgIGlmICghcHJvcHM/LmFjY291bnRJZCB8fCAhcHJvcHM/LmlwdjRJcGFtUG9vbElkKSB7XG4gICAgICByZXR1cm4gdW5kZWZpbmVkO1xuICAgIH1cblxuICAgIHJldHVybiBlYzIuSXBBZGRyZXNzZXMuYXdzSXBhbUFsbG9jYXRpb24oe1xuICAgICAgaXB2NElwYW1Qb29sSWQ6IHByb3BzLmlwdjRJcGFtUG9vbElkLFxuICAgICAgaXB2NE5ldG1hc2tMZW5ndGg6IDIwLFxuICAgICAgZGVmYXVsdFN1Ym5ldElwdjROZXRtYXNrTGVuZ3RoOiAyM1xuICAgIH0pO1xuICB9XG5cbiAgc3RhdGljIGJ1aWxkKGlkOiBzdHJpbmcsIHByb3BzPzogVnBjUHJvcHMpOiAoc2I6IFN0YWNrQnVpbGRlcikgPT4gQ29uc3RydWN0IHtcbiAgICByZXR1cm4gKHNiOiBTdGFja0J1aWxkZXIpID0+IHtcbiAgICAgIHJldHVybiBuZXcgdGhpcyhzYi5nZXRTdGFjaygpLCBpZCwgcHJvcHMpO1xuICAgIH07XG4gIH1cbiAgLyoqXG4gICAqIEltcG9ydHMgYSBwcmUtZXhpc3RpbmcgVlBDIFJlc291cmNlIGludG8geW91ciBTdGFja1xuICAgKlxuICAgKiBCZWZvcmUgdXNpbmcgYW4gaW1wb3J0IG1ldGhvZCBlbnN1cmUgeW91IGhhdmUgc2V0IHRoZSBhY2NvdW50IGFuZCByZWdpb24gcHJvcHNcbiAgICogIHdoZW4gY3JlYXRpbmcgeW91ciBBd3NTdGFjay5cbiAgICpcbiAgICogQHBhcmFtIGlkXG4gICAqIEBwYXJhbSB2cGNTdGFja05hbWVcbiAgICogQHJldHVybnNcbiAgICovXG4gIHN0YXRpYyBpbXBvcnQoXG4gICAgaWQ6IHN0cmluZyxcbiAgICB2cGNTdGFja05hbWU6IHN0cmluZ1xuICApOiAoc2I6IFN0YWNrQnVpbGRlcikgPT4gQ29uc3RydWN0IHtcbiAgICByZXR1cm4gKHNiOiBTdGFja0J1aWxkZXIpID0+IHtcbiAgICAgIHJldHVybiBlYzIuVnBjLmZyb21Mb29rdXAoc2IuZ2V0U3RhY2soKSwgaWQsIHtcbiAgICAgICAgdnBjTmFtZTogYCR7dnBjU3RhY2tOYW1lfS8ke2lkfWBcbiAgICAgIH0pO1xuICAgIH07XG4gIH1cbn1cbiJdfQ==
|
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const getConfig_1 = require("./getConfig");
|
|
4
4
|
function getAccountId(environment) {
|
|
5
5
|
//TODO: in the use cases of getAccountId, we are currently passing in accountName
|
|
6
|
-
const config = (0, getConfig_1.
|
|
6
|
+
const config = (0, getConfig_1.getConfig)(environment);
|
|
7
7
|
// TODO: need to fix how we handle this in the VPC module
|
|
8
8
|
if (!config || !config.accountId)
|
|
9
9
|
return "error";
|
|
10
10
|
return config.accountId;
|
|
11
11
|
}
|
|
12
12
|
exports.default = getAccountId;
|
|
13
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
13
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0QWNjb3VudElkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2dldEFjY291bnRJZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJDQUF3QztBQUV4QyxTQUF3QixZQUFZLENBQUMsV0FBbUI7SUFDdEQsaUZBQWlGO0lBQ2pGLE1BQU0sTUFBTSxHQUFHLElBQUEscUJBQVMsRUFBQyxXQUFXLENBQUMsQ0FBQztJQUN0Qyx5REFBeUQ7SUFDekQsSUFBSSxDQUFDLE1BQU0sSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTO1FBQUUsT0FBTyxPQUFPLENBQUM7SUFFakQsT0FBTyxNQUFNLENBQUMsU0FBUyxDQUFDO0FBQzFCLENBQUM7QUFQRCwrQkFPQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGdldENvbmZpZyB9IGZyb20gXCIuL2dldENvbmZpZ1wiO1xuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBnZXRBY2NvdW50SWQoZW52aXJvbm1lbnQ6IHN0cmluZyk6IHN0cmluZyB7XG4gIC8vVE9ETzogaW4gdGhlIHVzZSBjYXNlcyBvZiBnZXRBY2NvdW50SWQsIHdlIGFyZSBjdXJyZW50bHkgcGFzc2luZyBpbiBhY2NvdW50TmFtZVxuICBjb25zdCBjb25maWcgPSBnZXRDb25maWcoZW52aXJvbm1lbnQpO1xuICAvLyBUT0RPOiBuZWVkIHRvIGZpeCBob3cgd2UgaGFuZGxlIHRoaXMgaW4gdGhlIFZQQyBtb2R1bGVcbiAgaWYgKCFjb25maWcgfHwgIWNvbmZpZy5hY2NvdW50SWQpIHJldHVybiBcImVycm9yXCI7XG5cbiAgcmV0dXJuIGNvbmZpZy5hY2NvdW50SWQ7XG59XG4iXX0=
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { Account } from "@aws-sdk/client-organizations";
|
|
2
2
|
interface Config {
|
|
3
|
-
environment: string;
|
|
4
|
-
accountId: string;
|
|
5
|
-
accountName: string;
|
|
6
3
|
region: string;
|
|
4
|
+
environment: string;
|
|
7
5
|
existingAccounts: Account[];
|
|
6
|
+
accountId?: string;
|
|
7
|
+
accountName?: string;
|
|
8
8
|
}
|
|
9
|
-
export declare function
|
|
10
|
-
export declare function getConfig(): Config;
|
|
9
|
+
export declare function getConfig(accountName?: string): Config;
|
|
11
10
|
export default getConfig;
|
|
@@ -1,54 +1,32 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getConfig =
|
|
3
|
+
exports.getConfig = void 0;
|
|
4
4
|
const app_1 = require("../app");
|
|
5
5
|
const util_1 = require("@fjall/util");
|
|
6
|
-
function
|
|
7
|
-
const config = util_1.Config.loadConfig();
|
|
8
|
-
const providerAccount = config.getProviderAccount(accountName);
|
|
9
|
-
const existingAccounts = config.getExistingAccounts();
|
|
10
|
-
const region = process.env.AWS_REGION;
|
|
11
|
-
if (!providerAccount) {
|
|
12
|
-
console.error(`No provider account found for account: ${accountName}`);
|
|
13
|
-
throw new Error(`No provider account found for account: ${accountName}`);
|
|
14
|
-
}
|
|
15
|
-
if (!region) {
|
|
16
|
-
console.error("Variable AWS_REGION is not set in your environment, please specify");
|
|
17
|
-
throw new Error("Variable AWS_REGION is not set in your environment, please specify");
|
|
18
|
-
}
|
|
19
|
-
return {
|
|
20
|
-
environment: providerAccount.environment,
|
|
21
|
-
accountId: providerAccount.id,
|
|
22
|
-
accountName: providerAccount.name,
|
|
23
|
-
region: region,
|
|
24
|
-
existingAccounts: existingAccounts
|
|
25
|
-
};
|
|
26
|
-
}
|
|
27
|
-
exports.getEnvironmentConfig = getEnvironmentConfig;
|
|
28
|
-
function getConfig() {
|
|
6
|
+
function getConfig(accountName) {
|
|
29
7
|
const app = app_1.default.getInstance();
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
const existingAccounts = config.getExistingAccounts();
|
|
35
|
-
const region = process.env.AWS_REGION;
|
|
36
|
-
if (!providerAccount) {
|
|
37
|
-
console.warn(`No provider account found for account: ${env}`);
|
|
38
|
-
throw new Error(`No provider account found for account: ${env}`);
|
|
39
|
-
}
|
|
40
|
-
if (!region) {
|
|
41
|
-
console.error("Variable AWS_REGION is not set in your environment");
|
|
42
|
-
throw new Error("Variable AWS_REGION is not set in your environment");
|
|
43
|
-
}
|
|
44
|
-
return {
|
|
45
|
-
environment: providerAccount.environment,
|
|
46
|
-
accountId: providerAccount.id,
|
|
47
|
-
accountName: providerAccount.name,
|
|
48
|
-
region: region,
|
|
49
|
-
existingAccounts: existingAccounts
|
|
8
|
+
const config = {
|
|
9
|
+
region: process.env.AWS_REGION || "us-east-1",
|
|
10
|
+
environment: "development",
|
|
11
|
+
existingAccounts: []
|
|
50
12
|
};
|
|
13
|
+
if (!process.env.AWS_REGION)
|
|
14
|
+
console.warn("AWS_REGION is not set, defaulting to us-east-1");
|
|
15
|
+
// If unspecified account name - try to retrieve from context
|
|
16
|
+
if (!accountName)
|
|
17
|
+
accountName = app.node.tryGetContext("accountName");
|
|
18
|
+
// If we have an account name - look for associated provider account
|
|
19
|
+
if (accountName) {
|
|
20
|
+
const fjallConfig = util_1.Config.loadConfig();
|
|
21
|
+
const providerAccount = fjallConfig.getProviderAccount(accountName);
|
|
22
|
+
if (!!providerAccount) {
|
|
23
|
+
config.accountId = providerAccount.id;
|
|
24
|
+
config.accountName = providerAccount.name;
|
|
25
|
+
config.environment = providerAccount.environment;
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return config;
|
|
51
29
|
}
|
|
52
30
|
exports.getConfig = getConfig;
|
|
53
31
|
exports.default = getConfig;
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ2V0Q29uZmlnLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vbGliL3V0aWxzL2dldENvbmZpZy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxnQ0FBeUI7QUFDekIsc0NBQW9EO0FBVXBELFNBQWdCLFNBQVMsQ0FBQyxXQUFvQjtJQUM1QyxNQUFNLEdBQUcsR0FBRyxhQUFHLENBQUMsV0FBVyxFQUFFLENBQUM7SUFFOUIsTUFBTSxNQUFNLEdBQVc7UUFDckIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxJQUFJLFdBQVc7UUFDN0MsV0FBVyxFQUFFLGFBQWE7UUFDMUIsZ0JBQWdCLEVBQUUsRUFBRTtLQUNyQixDQUFDO0lBRUYsSUFBSSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVTtRQUN6QixPQUFPLENBQUMsSUFBSSxDQUFDLGdEQUFnRCxDQUFDLENBQUM7SUFFakUsNkRBQTZEO0lBQzdELElBQUksQ0FBQyxXQUFXO1FBQUUsV0FBVyxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLGFBQWEsQ0FBQyxDQUFDO0lBRXRFLG9FQUFvRTtJQUNwRSxJQUFJLFdBQVcsRUFBRTtRQUNmLE1BQU0sV0FBVyxHQUFHLGFBQVcsQ0FBQyxVQUFVLEVBQUUsQ0FBQztRQUM3QyxNQUFNLGVBQWUsR0FBRyxXQUFXLENBQUMsa0JBQWtCLENBQUMsV0FBVyxDQUFDLENBQUM7UUFDcEUsSUFBSSxDQUFDLENBQUMsZUFBZSxFQUFFO1lBQ3JCLE1BQU0sQ0FBQyxTQUFTLEdBQUcsZUFBZSxDQUFDLEVBQUUsQ0FBQztZQUN0QyxNQUFNLENBQUMsV0FBVyxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUM7WUFDMUMsTUFBTSxDQUFDLFdBQVcsR0FBRyxlQUFlLENBQUMsV0FBVyxDQUFDO1NBQ2xEO0tBQ0Y7SUFFRCxPQUFPLE1BQU0sQ0FBQztBQUNoQixDQUFDO0FBM0JELDhCQTJCQztBQUVELGtCQUFlLFNBQVMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFjY291bnQgfSBmcm9tIFwiQGF3cy1zZGsvY2xpZW50LW9yZ2FuaXphdGlvbnNcIjtcblxuaW1wb3J0IEFwcCBmcm9tIFwiLi4vYXBwXCI7XG5pbXBvcnQgeyBDb25maWcgYXMgRmphbGxDb25maWcgfSBmcm9tIFwiQGZqYWxsL3V0aWxcIjtcblxuaW50ZXJmYWNlIENvbmZpZyB7XG4gIHJlZ2lvbjogc3RyaW5nO1xuICBlbnZpcm9ubWVudDogc3RyaW5nO1xuICBleGlzdGluZ0FjY291bnRzOiBBY2NvdW50W107XG4gIGFjY291bnRJZD86IHN0cmluZztcbiAgYWNjb3VudE5hbWU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBnZXRDb25maWcoYWNjb3VudE5hbWU/OiBzdHJpbmcpOiBDb25maWcge1xuICBjb25zdCBhcHAgPSBBcHAuZ2V0SW5zdGFuY2UoKTtcblxuICBjb25zdCBjb25maWc6IENvbmZpZyA9IHtcbiAgICByZWdpb246IHByb2Nlc3MuZW52LkFXU19SRUdJT04gfHwgXCJ1cy1lYXN0LTFcIixcbiAgICBlbnZpcm9ubWVudDogXCJkZXZlbG9wbWVudFwiLFxuICAgIGV4aXN0aW5nQWNjb3VudHM6IFtdXG4gIH07XG5cbiAgaWYgKCFwcm9jZXNzLmVudi5BV1NfUkVHSU9OKVxuICAgIGNvbnNvbGUud2FybihcIkFXU19SRUdJT04gaXMgbm90IHNldCwgZGVmYXVsdGluZyB0byB1cy1lYXN0LTFcIik7XG5cbiAgLy8gSWYgdW5zcGVjaWZpZWQgYWNjb3VudCBuYW1lIC0gdHJ5IHRvIHJldHJpZXZlIGZyb20gY29udGV4dFxuICBpZiAoIWFjY291bnROYW1lKSBhY2NvdW50TmFtZSA9IGFwcC5ub2RlLnRyeUdldENvbnRleHQoXCJhY2NvdW50TmFtZVwiKTtcblxuICAvLyBJZiB3ZSBoYXZlIGFuIGFjY291bnQgbmFtZSAtIGxvb2sgZm9yIGFzc29jaWF0ZWQgcHJvdmlkZXIgYWNjb3VudFxuICBpZiAoYWNjb3VudE5hbWUpIHtcbiAgICBjb25zdCBmamFsbENvbmZpZyA9IEZqYWxsQ29uZmlnLmxvYWRDb25maWcoKTtcbiAgICBjb25zdCBwcm92aWRlckFjY291bnQgPSBmamFsbENvbmZpZy5nZXRQcm92aWRlckFjY291bnQoYWNjb3VudE5hbWUpO1xuICAgIGlmICghIXByb3ZpZGVyQWNjb3VudCkge1xuICAgICAgY29uZmlnLmFjY291bnRJZCA9IHByb3ZpZGVyQWNjb3VudC5pZDtcbiAgICAgIGNvbmZpZy5hY2NvdW50TmFtZSA9IHByb3ZpZGVyQWNjb3VudC5uYW1lO1xuICAgICAgY29uZmlnLmVudmlyb25tZW50ID0gcHJvdmlkZXJBY2NvdW50LmVudmlyb25tZW50O1xuICAgIH1cbiAgfVxuXG4gIHJldHVybiBjb25maWc7XG59XG5cbmV4cG9ydCBkZWZhdWx0IGdldENvbmZpZztcbiJdfQ==
|