Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit d6840b0

Browse files
committed
Update runtime to nodejs10.x. Update infra to Terraform 0.12
1 parent 14f9467 commit d6840b0

File tree

6 files changed

+33
-29
lines changed

6 files changed

+33
-29
lines changed

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.10.0
1+
10

‎buildspec.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
TF_VAR_kms_key_arns: '["arn:aws:kms:ap-southeast-2:982898479788:key/0ec9686b-13a1-40fc-8256-86e8d3503e9c"]'
99
TF_VAR_ssm_parameter_arns: '["arn:aws:ssm:ap-southeast-2:982898479788:parameter/shared/*","arn:aws:ssm:ap-southeast-2:982898479788:parameter/serverless-node-dynamodb-api/*"]'
1010
TF_VAR_build_docker_image: "jch254/docker-node-terraform-aws"
11-
TF_VAR_build_docker_tag: "6.10.0"
11+
TF_VAR_build_docker_tag: "10.x"
1212
TF_VAR_buildspec: "buildspec.yml"
1313
TF_VAR_source_location: "https://github.com/jch254/serverless-node-dynamodb-api.git"
1414
TF_VAR_cache_bucket: "603-codebuild-cache/serverless-node-dynamodb-api"

‎infrastructure/main.tf

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ terraform {
55
}
66

77
provider "aws" {
8-
region = "${var.region}"
9-
version = "~> 1.0"
8+
region = var.region
9+
version = "~> 2.0"
1010
}
1111

1212
resource "aws_iam_role" "codebuild_role" {
@@ -26,54 +26,55 @@ resource "aws_iam_role" "codebuild_role" {
2626
]
2727
}
2828
EOF
29+
2930
}
3031

3132
data "template_file" "codebuild_policy" {
32-
template = "${file("./codebuild-role-policy.tpl")}"
33+
template = file("./codebuild-role-policy.tpl")
3334

34-
vars {
35-
kms_key_arns ="${var.kms_key_arns}"
36-
ssm_parameter_arns = "${var.ssm_parameter_arns}"
35+
vars ={
36+
kms_key_arns =var.kms_key_arns
37+
ssm_parameter_arns = var.ssm_parameter_arns
3738
}
3839
}
3940

4041
resource "aws_iam_role_policy" "codebuild_policy" {
41-
name = "${var.name}-codebuild-policy"
42-
role ="${aws_iam_role.codebuild_role.id}"
43-
policy = "${data.template_file.codebuild_policy.rendered}"
42+
name = "${var.name}-codebuild-policy"
43+
role =aws_iam_role.codebuild_role.id
44+
policy = data.template_file.codebuild_policy.rendered
4445
}
4546

4647
resource "aws_codebuild_webhook" "codebuild_webhook" {
47-
project_name ="${var.name}"
48+
project_name =var.name
4849
branch_filter = "master"
4950
}
5051

5152
module "codebuild_project" {
52-
source = "github.com/jch254/terraform-modules//codebuild-project?ref=1.0.4"
53+
source = "github.com/jch254/terraform-modules//codebuild-project?ref=1.0.5"
5354

54-
name ="${var.name}"
55-
codebuild_role_arn = "${aws_iam_role.codebuild_role.arn}"
56-
build_docker_image = "${var.build_docker_image}"
57-
build_docker_tag ="${var.build_docker_tag}"
58-
source_type ="${var.source_type}"
59-
buildspec ="${var.buildspec}"
60-
source_location ="${var.source_location}"
61-
cache_bucket ="${var.cache_bucket}"
55+
name =var.name
56+
codebuild_role_arn = aws_iam_role.codebuild_role.arn
57+
build_docker_image = var.build_docker_image
58+
build_docker_tag =var.build_docker_tag
59+
source_type =var.source_type
60+
buildspec =var.buildspec
61+
source_location =var.source_location
62+
cache_bucket =var.cache_bucket
6263
}
6364

6465
resource "aws_api_gateway_domain_name" "domain" {
65-
domain_name ="${var.dns_name}"
66-
certificate_arn = "${var.acm_arn}"
66+
domain_name =var.dns_name
67+
certificate_arn = var.acm_arn
6768
}
6869

6970
resource "aws_route53_record" "domain" {
70-
zone_id = "${var.route53_zone_id}"
71-
name ="${aws_api_gateway_domain_name.domain.domain_name}"
72-
type = "A"
71+
zone_id = var.route53_zone_id
72+
name =aws_api_gateway_domain_name.domain.domain_name
73+
type = "A"
7374

7475
alias {
75-
name ="${aws_api_gateway_domain_name.domain.cloudfront_domain_name}"
76-
zone_id ="${aws_api_gateway_domain_name.domain.cloudfront_zone_id}"
76+
name =aws_api_gateway_domain_name.domain.cloudfront_domain_name
77+
zone_id =aws_api_gateway_domain_name.domain.cloudfront_zone_id
7778
evaluate_target_health = false
7879
}
7980
}

‎infrastructure/outputs.tf

Whitespace-only changes.

‎infrastructure/versions.tf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
terraform {
2+
required_version = ">= 0.12"
3+
}

‎serverless.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ plugins:
99

1010
provider:
1111
name: aws
12-
runtime: nodejs6.10
12+
runtime: nodejs10.x
1313
stage: prod
1414
region: ap-southeast-2
1515
iamRoleStatements:

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /