Make terraform validate succeed

Author: gertjanmaas

examples/default/outputs.tf

@@ -1,17 +1,17 @@
-output "action_runners" {
+output "runners" {
   value = {
     runners = module.runners.runners
   }
 }
 
+# output "binaries_syncer" {
+#   value = {
+#     binaries_syncer = module.runners.binaries_syncer
+#   }
+# }
 
-output "lambda_binaries_syncer_name" {
-  value = module.runners.binaries_syncer.lambda.id
-}
-
-
-output "github_app_webhook_secret" {
-  value = random_password.random.result
+output "webhook" {
+  value = {
+    gateway = module.runners.webhook.gateway
+  }
 }
-
-

main.tf

@@ -43,6 +43,15 @@ 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_client_id     = var.github_app_client_id
+  github_app_client_secret = var.github_app_client_secret
+  github_app_id            = var.github_app_id
+  github_app_key_base64    = var.github_app_key_base64
+
+  enable_organization_runners = var.enable_organization_runners
 }
 
 module "runner_binaries" {

modules/runners/policies/lambda-scale-down.json

@@ -1,11 +1,15 @@
 {
-    "Effect": "Allow",
-    "Action": [
-      "ec2:DescribeInstances*",
-      "ec2:DescribeTags",
-      "ec2:CreateTags",
-      "ec2:TerminateInstances"
-    ],
-    "Resource": ["*"]
-  },
-}
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ec2:DescribeInstances*",
+        "ec2:DescribeTags",
+        "ec2:CreateTags",
+        "ec2:TerminateInstances"
+      ],
+      "Resource": ["*"]
+    }
+  ]
+}

modules/runners/policies/lambda-scale-up.json

@@ -1,16 +1,20 @@
 {
-    "Effect": "Allow",
-    "Action": [
-      "ec2:DescribeInstances",
-      "ec2:DescribeTags",
-      "ec2:CreateTags",
-      "ec2:RunInstances",
-    ],
-    "Resource": ["*"]
-  },
-  {
-    "Effect": "Allow",
-    "Action": "iam:PassRole",
-    "Resource": "${arn_runner_instance_role}"
-  }
-}
+  "Version": "2012-10-17",
+  "Statement": [
+    {
+      "Effect": "Allow",
+      "Action": [
+        "ec2:DescribeInstances",
+        "ec2:DescribeTags",
+        "ec2:CreateTags",
+        "ec2:RunInstances"
+      ],
+      "Resource": ["*"]
+    },
+    {
+      "Effect": "Allow",
+      "Action": "iam:PassRole",
+      "Resource": "${arn_runner_instance_role}"
+    }
+  ]
+}

outputs.tf

@@ -16,6 +16,7 @@ output "binaries_syncer" {
 
 output "webhook" {
   value = {
+    gateway     = module.webhook.gateway
     lambda      = module.webhook.lambda
     lambda_role = module.webhook.lambda_role
   }