From 40a606afd7fe1981191ef93c8737b21a9167817a Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Wed, 12 Nov 2025 16:28:04 -0800 Subject: [PATCH 1/2] fix readme tester --- release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release.yaml b/release.yaml index 7c02ea3..f5f690f 100644 --- a/release.yaml +++ b/release.yaml @@ -24,7 +24,7 @@ internal: # convert the tag to the image family format which uses hipens and is only for `major-minor` echo "{{tag}}" | grep -o -E "[[:digit:]]+\.[[:digit:]]+" | sed 's/\./-/' > family_tag - name: "files(README.md)" - cmd: comby "$(cat prev_tag)" '{{tag}}' -i -f .md + cmd: comby -in-place "$(cat prev_tag)" '{{tag}}' README.md - name: "files(tf)" cmd: comby "\"$(cat prev_tag)\"" '"{{tag}}"' -i -f .tf -exclude providers.tf - name: "family(name):docker-mirror" @@ -163,7 +163,7 @@ test: echo "expected ${expected} .tf files to be updated with \"{{tag}}\" but got ${count}" exit 1 fi - - name: changes:family(docker-mirror)"" + - name: "changes:family(docker-mirror)" cmd: | set -eu From c150e9b6c37fea7c3cd23663c0518c2a66d7b69c Mon Sep 17 00:00:00 2001 From: Warren Gifford Date: Wed, 12 Nov 2025 16:44:24 -0800 Subject: [PATCH 2/2] undo script change and set tags to 6.9 --- README.md | 16 ++++++++-------- examples/multiple-executors/README.md | 4 ++-- examples/multiple-executors/main.tf | 8 ++++---- examples/private-single-executor/main.tf | 2 +- examples/single-executor/README.md | 4 ++-- examples/single-executor/main.tf | 2 +- modules/docker-mirror/README.md | 2 +- modules/executors/README.md | 4 ++-- modules/networking/README.md | 2 +- release.yaml | 4 ++-- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README.md b/README.md index 93891e6..bced59d 100644 --- a/README.md +++ b/README.md @@ -6,20 +6,20 @@ This repository provides a [Terraform module](https://learn.hashicorp.com/tutori This repository provides four submodules: -1. The [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/executors) provisions compute resources for executors. -2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/docker-mirror) provisions a Docker registry pull-through cache. -3. The [networking module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/networking) provisions a network to be shared by the executor and Docker registry resources. -4. The [credentials module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/credentials) provisions credentials required by the Sourcegraph instance to enable observability and auto-scaling of executors. +1. The [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/executors) provisions compute resources for executors. +2. The [docker-mirror module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/docker-mirror) provisions a Docker registry pull-through cache. +3. The [networking module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/networking) provisions a network to be shared by the executor and Docker registry resources. +4. The [credentials module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/credentials) provisions credentials required by the Sourcegraph instance to enable observability and auto-scaling of executors. -The [multiple-executors example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/examples/multiple-executors) uses the submodule directly to provision multiple executor resource groups performing different types of work. Follow this example if you are: +The [multiple-executors example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/examples/multiple-executors) uses the submodule directly to provision multiple executor resource groups performing different types of work. Follow this example if you are: 1. Provisioning executors for use with multiple features (e.g., both [auto-indexing](https://sourcegraph.com/docs/code_intelligence/explanations/auto_indexing) and [server-side batch changes](https://sourcegraph.com/docs/batch_changes/explanations/server_side)), or 2. Provisioning resources for multiple Sourcegraph instances (e.g., test, prod) -This repository also provides a [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0) combining the executors, network, and docker-mirror resources into an easier to use package. +This repository also provides a [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0) combining the executors, network, and docker-mirror resources into an easier to use package. -The [single-executor example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/examples/single-executor) uses the root module to provision a single executor type. Follow this example if you are deploying to a single Sourcegraph instance and using a single executors-backed feature. +The [single-executor example](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/examples/single-executor) uses the root module to provision a single executor type. Follow this example if you are deploying to a single Sourcegraph instance and using a single executors-backed feature. ## Requirements @@ -28,7 +28,7 @@ The [single-executor example](https://github.com/sourcegraph/terraform-aws-execu - 4.2.0 and above: `>= 1.1.0, < 2.0.0` - [hashicorp/aws](https://registry.terraform.io/providers/hashicorp/aws) - 4.1.0 and below: `~> 3.0.0` - - 4.2.0 and above: `>= 3.0, < 6.8.0` + - 4.2.0 and above: `>= 3.0, < 6.9.0` ## Setup diff --git a/examples/multiple-executors/README.md b/examples/multiple-executors/README.md index 178c58c..2b60a3a 100644 --- a/examples/multiple-executors/README.md +++ b/examples/multiple-executors/README.md @@ -1,6 +1,6 @@ # Multiple executor example -This example uses [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/executors) submodules that provision a network, a Docker registry mirror, and sets of resources running one or more types of executors. +This example uses [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/networking), [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/docker-mirror), and [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/executors) submodules that provision a network, a Docker registry mirror, and sets of resources running one or more types of executors. The following variables must be supplied: @@ -10,4 +10,4 @@ The following variables must be supplied: If your deployment environment already has a Docker registry that can be used, only the `executor` submodule must be used (and references to the `networking` and `docker-mirror` modules can be dropped). The Docker registry mirror address can be supplied along with its containing VPC and subnet as pre-existing identifier literals. -All of these module's variables are defined in [modules/networking/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/modules/executors/variables.tf). \ No newline at end of file +All of these module's variables are defined in [modules/networking/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/modules/networking/variables.tf), [modules/docker-mirror/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/modules/docker-mirror/variables.tf), and [modules/executors/variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/modules/executors/variables.tf). \ No newline at end of file diff --git a/examples/multiple-executors/main.tf b/examples/multiple-executors/main.tf index 429e2f6..b9196bf 100644 --- a/examples/multiple-executors/main.tf +++ b/examples/multiple-executors/main.tf @@ -6,7 +6,7 @@ locals { module "networking" { source = "sourcegraph/executors/aws//modules/networking" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST availability_zone = local.availability_zone randomize_resource_names = true @@ -14,7 +14,7 @@ module "networking" { module "docker-mirror" { source = "sourcegraph/executors/aws//modules/docker-mirror" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST vpc_id = module.networking.vpc_id subnet_id = module.networking.subnet_id @@ -25,7 +25,7 @@ module "docker-mirror" { module "executors-codeintel" { source = "sourcegraph/executors/aws//modules/executors" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST vpc_id = module.networking.vpc_id subnet_id = module.networking.subnet_id @@ -43,7 +43,7 @@ module "executors-codeintel" { module "executors-batches" { source = "sourcegraph/executors/aws//modules/executors" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST vpc_id = module.networking.vpc_id subnet_id = module.networking.subnet_id diff --git a/examples/private-single-executor/main.tf b/examples/private-single-executor/main.tf index 750fbc2..fc62e4d 100644 --- a/examples/private-single-executor/main.tf +++ b/examples/private-single-executor/main.tf @@ -5,7 +5,7 @@ locals { module "executors" { source = "sourcegraph/executors/aws" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST availability_zone = local.availability_zone executor_instance_tag = "codeintel-prod" diff --git a/examples/single-executor/README.md b/examples/single-executor/README.md index cbfae7f..96a8098 100644 --- a/examples/single-executor/README.md +++ b/examples/single-executor/README.md @@ -1,6 +1,6 @@ # Single executor example -This example uses the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0) that provisions a network, a Docker registry mirror, and a set of resources to run _one_ type of executor. To provision more than one type of executor (multiple queues or multiple environments), see the following `multiple-executors` example. +This example uses the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0) that provisions a network, a Docker registry mirror, and a set of resources to run _one_ type of executor. To provision more than one type of executor (multiple queues or multiple environments), see the following `multiple-executors` example. The following variables must be supplied: @@ -12,4 +12,4 @@ The following variables must be supplied: - `executor_metrics_environment_label`: The name of the target environment (e.g., `staging`, `prod`). This value must be the same as the `EXECUTOR_METRIC_ENVIRONMENT_LABEL` environment variable as described in [Configuring auto scaling](https://docs.sourcegraph.com/admin/deploy_executors#aws). - `executor_instance_tag`: Compute instances are tagged by this value by the key `executor_tag`. We recommend this value take the form `{executor_queue_name}-{executor_metrics_environment_label}`. This value must be the same as `INSTANCE_TAG` as described in [Configuring observability](https://docs.sourcegraph.com/admin/deploy_executors#aws-1). -All of this module's variables are defined in [variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.8.0/variables.tf). \ No newline at end of file +All of this module's variables are defined in [variables.tf](https://github.com/sourcegraph/terraform-aws-executors/blob/v6.9.0/variables.tf). \ No newline at end of file diff --git a/examples/single-executor/main.tf b/examples/single-executor/main.tf index dc75456..0130d2f 100644 --- a/examples/single-executor/main.tf +++ b/examples/single-executor/main.tf @@ -5,7 +5,7 @@ locals { module "executors" { source = "sourcegraph/executors/aws" - version = "6.8.0" # LATEST + version = "6.9.0" # LATEST availability_zone = local.availability_zone executor_instance_tag = "codeintel-prod" diff --git a/modules/docker-mirror/README.md b/modules/docker-mirror/README.md index e0aa19d..449660a 100644 --- a/modules/docker-mirror/README.md +++ b/modules/docker-mirror/README.md @@ -2,4 +2,4 @@ This module provides a hosted Docker registry pull-through cache to be used by [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors). It is strongly recommended to deploy a Docker mirror as a cache to reduce rate limiting by the public [Docker Hub registry](https://hub.docker.com/). We have also seen deploying a Docker mirror in the same physical zone as the executors significantly decreased latencies during image pulls. -When using the sibling [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/executors), the `vpc_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${static_ip}:5000"`. \ No newline at end of file +When using the sibling [executors module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/executors), the `vpc_id` and `subnet_id` values must match and the executor module `docker_registry_mirror` value should match `"http://${static_ip}:5000"`. \ No newline at end of file diff --git a/modules/executors/README.md b/modules/executors/README.md index e4f238a..025de1d 100644 --- a/modules/executors/README.md +++ b/modules/executors/README.md @@ -1,6 +1,6 @@ # Executors module -This module provides the resources to provision [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors) compute resources on AWS. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0). This module includes the following resources: +This module provides the resources to provision [Sourcegraph executor](https://docs.sourcegraph.com/admin/executors) compute resources on AWS. For a high-level overview of the resources deployed by this module, see the [root module](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0). This module includes the following resources: - AWS launch template - AWS autoscaler and autoscaling policy @@ -10,4 +10,4 @@ This module provides the resources to provision [Sourcegraph executor](https://d This module does **not** automatically create networking or Docker mirror resources. The `vpc_id`, `subnet_id`, and `docker_registry_mirror` variables must be supplied explicitly with resources that have been previously created. -This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/docker-mirror) resources which can be shared by multiple instances of the executor module (listening to different queues or being deployed in a different environment). \ No newline at end of file +This module is often used with the sibling modules that create [networking](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/networking) and [Docker mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/docker-mirror) resources which can be shared by multiple instances of the executor module (listening to different queues or being deployed in a different environment). \ No newline at end of file diff --git a/modules/networking/README.md b/modules/networking/README.md index 3613675..0753b7e 100644 --- a/modules/networking/README.md +++ b/modules/networking/README.md @@ -1,6 +1,6 @@ # Networking module -This module provides the networking glue between the sibling [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/executors) and [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.8.0/submodules/docker-mirror) modules. +This module provides the networking glue between the sibling [executors](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/executors) and [docker-mirror](https://registry.terraform.io/modules/sourcegraph/executors/aws/6.9.0/submodules/docker-mirror) modules. This module is very simple, creating only a network and a subnet by default. diff --git a/release.yaml b/release.yaml index f5f690f..7c02ea3 100644 --- a/release.yaml +++ b/release.yaml @@ -24,7 +24,7 @@ internal: # convert the tag to the image family format which uses hipens and is only for `major-minor` echo "{{tag}}" | grep -o -E "[[:digit:]]+\.[[:digit:]]+" | sed 's/\./-/' > family_tag - name: "files(README.md)" - cmd: comby -in-place "$(cat prev_tag)" '{{tag}}' README.md + cmd: comby "$(cat prev_tag)" '{{tag}}' -i -f .md - name: "files(tf)" cmd: comby "\"$(cat prev_tag)\"" '"{{tag}}"' -i -f .tf -exclude providers.tf - name: "family(name):docker-mirror" @@ -163,7 +163,7 @@ test: echo "expected ${expected} .tf files to be updated with \"{{tag}}\" but got ${count}" exit 1 fi - - name: "changes:family(docker-mirror)" + - name: changes:family(docker-mirror)"" cmd: | set -eu