Fix duplicate log group error for multi-executor demo

Author: bblnasch

.gitignore

@@ -1,2 +1,6 @@
 .terraform
 plan
+terraform.tfstate
+terraform.tfstate.backup
+.terraform.lock.hcl
+tfplan

examples/multiple-executors/main.tf

@@ -1,7 +1,9 @@
 locals {
-  region                  = "us-west-2"
-  availability_zone       = "us-west-2a"
-  docker_mirror_static_ip = "10.0.1.4"
+  region                                       = "us-west-2"
+  availability_zone                            = "us-west-2a"
+  docker_mirror_static_ip                      = "10.0.1.4"
+  sourcegraph_external_url                     = "https://sourcegraph.acme.com"
+  executor_sourcegraph_executor_proxy_password = "hunter2"
 }
 
 module "networking" {
@@ -25,32 +27,33 @@ module "executors-codeintel" {
   source  = "sourcegraph/executors/aws//modules/executors"
   version = "3.43.0" # LATEST
 
-  vpc_id                              = module.networking.vpc_id
-  subnet_id                           = module.networking.subnet_id
-  resource_prefix                     = "codeintel-prod"
-  instance_tag                        = "codeintel-prod"
-  sourcegraph_external_url            = "https://sourcegraph.acme.com"
-  sourcegraph_executor_proxy_password = "hunter2"
-  queue_name                          = "codeintel"
-  metrics_environment_label           = "prod"
-  docker_registry_mirror              = "http://${local.docker_mirror_static_ip}:5000"
-  #   docker_registry_mirror_node_exporter_url = "http://${local.docker_mirror_static_ip}:9999"
-  use_firecracker = true
+  vpc_id                                   = module.networking.vpc_id
+  subnet_id                                = module.networking.subnet_id
+  resource_prefix                          = "codeintel-prod"
+  instance_tag                             = "codeintel-prod"
+  sourcegraph_external_url                 = local.sourcegraph_external_url
+  sourcegraph_executor_proxy_password      = local.executor_sourcegraph_executor_proxy_password
+  queue_name                               = "codeintel"
+  metrics_environment_label                = "prod"
+  docker_registry_mirror                   = "http://${local.docker_mirror_static_ip}:5000"
+  # docker_registry_mirror_node_exporter_url = "http://${local.docker_mirror_static_ip}:9999"
+  use_firecracker                          = true
 }
 
 module "executors-batches" {
   source  = "sourcegraph/executors/aws//modules/executors"
   version = "3.43.0" # LATEST
 
-  vpc_id                              = module.networking.vpc_id
-  subnet_id                           = module.networking.subnet_id
-  resource_prefix                     = "batches-prod"
-  instance_tag                        = "batches-prod"
-  sourcegraph_external_url            = "https://sourcegraph.acme.com"
-  sourcegraph_executor_proxy_password = "hunter2"
-  queue_name                          = "batches"
-  metrics_environment_label           = "prod"
-  docker_registry_mirror              = "http://${local.docker_mirror_static_ip}:5000"
-  #   docker_registry_mirror_node_exporter_url = "http://${local.docker_mirror_static_ip}:9999"
-  use_firecracker = true
+  vpc_id                                   = module.networking.vpc_id
+  subnet_id                                = module.networking.subnet_id
+  resource_prefix                          = "batches-prod"
+  instance_tag                             = "batches-prod"
+  sourcegraph_external_url                 = local.sourcegraph_external_url
+  sourcegraph_executor_proxy_password      = local.executor_sourcegraph_executor_proxy_password
+  queue_name                               = "batches"
+  metrics_environment_label                = "prod"
+  docker_registry_mirror                   = "http://${local.docker_mirror_static_ip}:5000"
+  # docker_registry_mirror_node_exporter_url = "http://${local.docker_mirror_static_ip}:9999"
+  use_firecracker                          = true
+  need_syslogs                             = false
 }

examples/single-executor/main.tf

@@ -1,16 +1,15 @@
 locals {
-  region            = "us-west-2"
-  availability_zone = "us-west-2a"
+  region            = "us-east-2"
+  availability_zone = "us-east-2a"
 }
 
 module "executors" {
-  source  = "sourcegraph/executors/aws"
-  version = "3.43.0" # LATEST
+  source = "../../"
 
   availability_zone                            = local.availability_zone
   executor_instance_tag                        = "codeintel-prod"
-  executor_sourcegraph_external_url            = "https://sourcegraph.acme.com"
-  executor_sourcegraph_executor_proxy_password = "hunter2"
+  executor_sourcegraph_external_url            = "https://sg.sre.bbln.dev"
+  executor_sourcegraph_executor_proxy_password = "hJGwHr-3T-MDFcnD2XP6-a8G9cdHCk"
   executor_queue_name                          = "codeintel"
   executor_metrics_environment_label           = "prod"
   executor_use_firecracker                     = true

modules/executors/main.tf

@@ -73,6 +73,7 @@ resource "aws_security_group" "metrics_access" {
 
 resource "aws_cloudwatch_log_group" "syslogs" {
   # TODO: This is hardcoded in the executor image.
+  count             = var.need_syslogs ? 1 : 0
   name              = "executors"
   retention_in_days = 7
 }

modules/executors/variables.tf

@@ -188,3 +188,9 @@ variable "assign_public_ip" {
   default     = true
   description = "If false, no public IP will be associated with the executors."
 }
+
+variable "need_syslogs" {
+  type        = bool
+  default     = true
+  description = "For multi-executor only 1 of these needs to be made."
+}