Skip to content

Commit b13d957

Browse files
author
Steven Nemetz
committed
Fix formatting
1 parent 840d03f commit b13d957

File tree

13 files changed

+38
-28
lines changed

13 files changed

+38
-28
lines changed

examples/pagerduty-svc1/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
module "service" {
32
source = "../../modules/pagerduty"
43
service_key = "1234567890"

examples/pagerduty-svc2/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
module "service" {
32
source = "../../modules/pagerduty"
43
service_key = "123456789012"

examples/slack-ch1/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
module "channel" {
32
source = "../../modules/slack"
43
channel_name = "test-srv-1a"

examples/slack-ch2/main.tf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
module "channel" {
32
source = "../../modules/slack"
43
channel_name = "test-srv-2"

main.tf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
/*
32
create s3 bucket: permissions, encryption required
43
manage lambdas:
@@ -34,25 +33,25 @@ resource "aws_s3_bucket" "monitoring" {
3433
/**/
3534

3635
module "lambda_pagerduty" {
37-
source = "./modules/lambda"
38-
environment = "one"
39-
lambda_desc = "Datadog Pagerduty Integration"
40-
lambda_env_vars = "${var.lambda_pagerduty_env_vars}"
41-
lambda_handler = "datadog-pagerduty-integration.lambda_handler"
42-
lambda_name = "datadog_pagerduty"
43-
s3_bucket = "wiser-one-ci"
44-
source_dir = "pagerduty"
36+
source = "./modules/lambda"
37+
environment = "one"
38+
lambda_desc = "Datadog Pagerduty Integration"
39+
lambda_env_vars = "${var.lambda_pagerduty_env_vars}"
40+
lambda_handler = "datadog-pagerduty-integration.lambda_handler"
41+
lambda_name = "datadog_pagerduty"
42+
s3_bucket = "wiser-one-ci"
43+
source_dir = "pagerduty"
4544
}
4645

4746
module "lambda_slack" {
48-
source = "./modules/lambda"
49-
environment = "one"
50-
lambda_desc = "Datadog Slack Integration"
51-
lambda_env_vars = "${var.lambda_slack_env_vars}"
52-
lambda_handler = "datadog-slack-integration.lambda_handler"
53-
lambda_name = "datadog_slack"
54-
s3_bucket = "wiser-one-ci"
55-
source_dir = "slack"
47+
source = "./modules/lambda"
48+
environment = "one"
49+
lambda_desc = "Datadog Slack Integration"
50+
lambda_env_vars = "${var.lambda_slack_env_vars}"
51+
lambda_handler = "datadog-slack-integration.lambda_handler"
52+
lambda_name = "datadog_slack"
53+
s3_bucket = "wiser-one-ci"
54+
source_dir = "slack"
5655
}
5756

5857
resource "aws_s3_bucket_notification" "bucket_notification" {
@@ -64,6 +63,7 @@ resource "aws_s3_bucket_notification" "bucket_notification" {
6463
filter_prefix = "datadog/integration/pagerduty/"
6564
filter_suffix = ".json"
6665
}
66+
6767
lambda_function {
6868
lambda_function_arn = "${module.lambda_slack.lambda_arn}"
6969
events = ["s3:ObjectCreated:*", "s3:ObjectRemoved:*"]

modules/lambda/main.tf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ resource "aws_lambda_function" "this" {
9494

9595
tags {
9696
"Description" = "${var.lambda_desc}"
97+
9798
#"Stack" =
98-
"Terraform" = "true"
99+
"Terraform" = "true"
99100
}
100101
}
101102

modules/lambda/outputs.tf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
2-
31
output "lambda_arn" {
42
description = ""
53
value = "${aws_lambda_function.this.arn}"
64
}
5+
76
output "s3_bucket_id" {
87
description = ""
98
value = "${data.aws_s3_bucket.parts.id}"

modules/lambda/variables.tf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@ variable "environment" {
22
description = "Deploy environment"
33
default = ""
44
}
5+
56
variable "lambda_desc" {
67
description = "Description of lambda"
78
}
9+
810
variable "lambda_env_vars" {
911
description = "Environment variable to provide to lambda"
1012
type = "map"
1113
default = {}
1214
}
15+
1316
variable "lambda_handler" {
1417
description = "Lambda handler"
1518
}
@@ -38,3 +41,4 @@ variable "source_dir" {
3841
}
3942
}
4043
/**/
44+

modules/pagerduty/main.tf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
data "template_file" "pagerduty_service" {
22
template = "${file("${path.module}/templates/pagerduty.json")}"
3+
34
vars {
45
service_key = "${var.service_key}"
56
service_name = "${var.service_name}"
@@ -8,10 +9,12 @@ data "template_file" "pagerduty_service" {
89

910
resource "aws_s3_bucket_object" "object" {
1011
bucket = "${var.s3_bucket}"
12+
1113
#key = "datadog/integration type/service"
12-
key = "${var.s3_base}/service-${var.service_name}.json"
14+
key = "${var.s3_base}/service-${var.service_name}.json"
1315
content = "${data.template_file.pagerduty_service.rendered}"
16+
1417
# Should be encrypted
1518
server_side_encryption = "aws:kms"
16-
tags = "${var.tags}"
19+
tags = "${var.tags}"
1720
}

modules/pagerduty/variables.tf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
variable "service_key" {
22
description = "PagerDuty service integration key"
33
}
4+
45
variable "service_name" {
56
description = "PagerDuty service name as used in Datadog"
67
}
8+
79
variable "s3_base" {
810
description = "Base path in S3 bucket for PagerDuty configuration pieces"
911
default = "datadog/integration/pagerduty"

0 commit comments

Comments
 (0)