Merge branch 'feature/runners-lambdas' of github.com:philips-labs/ter…

…raform-aws-github-runner into feature/runners-lambdas
mcaulifn · May 11, 2020 · 8007a15 · 8007a15
2 parents 69068bf + 18bffe6
commit 8007a15
Show file tree

Hide file tree

Showing 21 changed files with 109 additions and 4,216 deletions.
diff --git a/.github/workflows/lambda-scale-down.yml b/.github/workflows/lambda-scale-down.yml
diff --git a/.gitignore b/.gitignore
@@ -16,3 +16,4 @@ example/*.secrets*.tfvars
 *.zip
 *.gz
 *.tgz
+*.env
diff --git a/main.tf b/main.tf
@@ -45,11 +45,10 @@ module "runners" {
   s3_bucket_runner_binaries   = module.runner_binaries.bucket
   s3_location_runner_binaries = local.s3_action_runner_url
 
-  sqs = aws_sqs_queue.queued_builds
-
-  github_app = var.github_app
-
-  enable_organization_runners = var.enable_organization_runners
+  sqs                            = aws_sqs_queue.queued_builds
+  github_app                     = var.github_app
+  enable_organization_runners    = var.enable_organization_runners
+  scale_down_schedule_expression = var.scale_down_schedule_expression
 }
 
 module "runner_binaries" {

diff --git a/modules/runner-binaries-syncer/runner-binaries-syncer.tf b/modules/runner-binaries-syncer/runner-binaries-syncer.tf
@@ -73,7 +73,7 @@ resource "aws_cloudwatch_event_target" "syncer" {
   arn  = aws_lambda_function.syncer.arn
 }
 
-resource "aws_lambda_permission" "allow_cloudwatch_to_call_check_foo" {
+resource "aws_lambda_permission" "syncer" {
   statement_id  = "AllowExecutionFromCloudWatch"
   action        = "lambda:InvokeFunction"
   function_name = aws_lambda_function.syncer.function_name

diff --git a/modules/runners/lambdas/scale-down/.nvmrc b/modules/runners/lambdas/scale-down/.nvmrc
diff --git a/modules/runners/lambdas/scale-down/.prettierrc b/modules/runners/lambdas/scale-down/.prettierrc
diff --git a/modules/runners/lambdas/scale-down/jest.config.js b/modules/runners/lambdas/scale-down/jest.config.js
diff --git a/modules/runners/lambdas/scale-down/package.json b/modules/runners/lambdas/scale-down/package.json
diff --git a/modules/runners/lambdas/scale-down/src/lambda.ts b/modules/runners/lambdas/scale-down/src/lambda.ts
diff --git a/modules/runners/lambdas/scale-down/src/local.ts b/modules/runners/lambdas/scale-down/src/local.ts
diff --git a/modules/runners/lambdas/scale-down/src/scale-down/handler.ts b/modules/runners/lambdas/scale-down/src/scale-down/handler.ts
diff --git a/modules/runners/lambdas/scale-down/tsconfig.json b/modules/runners/lambdas/scale-down/tsconfig.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,3 +16,4 @@ example/*.secrets*.tfvars @@
     *.zip
     *.gz
     *.tgz
+    *.env