fixed invalid references

Signed-off-by: Sam Alba <sam.alba@gmail.com>
This commit is contained in:
Sam Alba 2021-04-09 17:41:36 -07:00
parent b13ac200f3
commit d26ed13d88
4 changed files with 18 additions and 33 deletions

View File

@ -72,7 +72,7 @@ backend: {
// Docker image built from source, pushed to ECR // Docker image built from source, pushed to ECR
image: #ECRImage & { image: #ECRImage & {
source: source source: backend.source
repository: infra.ecrRepository repository: infra.ecrRepository
tag: slug tag: slug
awsConfig: infra.awsConfig awsConfig: infra.awsConfig
@ -92,7 +92,7 @@ backend: {
if infra.ecsTaskRoleArn != _|_ { if infra.ecsTaskRoleArn != _|_ {
taskRoleArn: infra.ecsTaskRoleArn taskRoleArn: infra.ecsTaskRoleArn
} }
hostname: hostname hostname: backend.hostname
healthCheck: { healthCheck: {
timeout: backend.container.healthCheckTimeout timeout: backend.container.healthCheckTimeout
path: backend.container.healthCheckPath path: backend.container.healthCheckPath
@ -101,7 +101,7 @@ backend: {
desiredCount: backend.container.desiredCount desiredCount: backend.container.desiredCount
container: { container: {
command: backend.container.command command: backend.container.command
environment: environment environment: backend.environment
port: backend.container.port port: backend.container.port
memory: backend.container.memory memory: backend.container.memory
"image": image.ref "image": image.ref

View File

@ -42,11 +42,8 @@ import (
} }
buildArg: buildArgs buildArg: buildArgs
}, },
op.Export & { op.#PushContainer & {
format: "string" ref: pushTarget
source: op.#PushContainer & {
ref: pushTarget
}
}, },
] ]

View File

@ -9,14 +9,13 @@ import (
) )
#ECSApp: { #ECSApp: {
awsConfig: aws.#Config awsConfig: aws.#Config
slug: string slug: string
clusterName: string clusterName: string
vpcId: string vpcId: string
elbListenerArn: string elbListenerArn: string
tlsCertificateArn: string taskRoleArn: *"" | string
taskRoleArn: *"" | string hostname: string
hostname: string
healthCheck: { healthCheck: {
timeout: *10 | int timeout: *10 | int
path: *"/" | string path: *"/" | string
@ -45,10 +44,9 @@ import (
stackName: slug stackName: slug
onFailure: "DO_NOTHING" onFailure: "DO_NOTHING"
parameters: { parameters: {
ELBRulePriority: elbRulePriority.out ELBRulePriority: elbRulePriority.out
ImageRef: container.image ImageRef: container.image
ELBListenerArn: elbListenerArn ELBListenerArn: elbListenerArn
TLSCertificateArn: tlsCertificateArn
} }
source: json.Marshal(template) source: json.Marshal(template)
} }
@ -57,19 +55,11 @@ import (
AWSTemplateFormatVersion: "2010-09-09" AWSTemplateFormatVersion: "2010-09-09"
Description: "Blocklayer deployed app" Description: "Blocklayer deployed app"
Parameters: { Parameters: {
ELBRulePriority: Type: "Number" ELBRulePriority: Type: "Number"
ImageRef: Type: "String" ImageRef: Type: "String"
ELBListenerArn: Type: "String" ELBListenerArn: Type: "String"
TLSCertificateArn: Type: "String"
} }
Resources: { Resources: {
TLSCertificate: {
Type: "AWS::ElasticLoadBalancingV2::ListenerCertificate"
Properties: {
Certificates: [ {CertificateArn: Ref: "TLSCertificateArn"}]
ListenerArn: Ref: "ELBListenerArn"
}
}
ECSTaskDefinition: { ECSTaskDefinition: {
Type: "AWS::ECS::TaskDefinition" Type: "AWS::ECS::TaskDefinition"
Properties: { Properties: {

View File

@ -17,8 +17,6 @@ import (
aws.#Script & { aws.#Script & {
files: { files: {
"/inputs/aws/access_key": config.accessKey
"/inputs/aws/secret_key": config.secretKey
"/inputs/listenerArn": listenerArn "/inputs/listenerArn": listenerArn
if vhost != _|_ { if vhost != _|_ {
"/inputs/vhost": vhost "/inputs/vhost": vhost