Merge branch 'main' into patch-1

kayman-mk · web-flow · commit 649efa23ba26 · 2025-08-14T10:58:30.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -72,7 +72,7 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
         name: Checkout source code
 
-      - uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
+      - uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4
         name: Cache plugin dir
         with:
           path: ~/.tflint.d/plugins
diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
diff --git a/.tflint.hcl b/.tflint.hcl
@@ -5,6 +5,6 @@ plugin "terraform" {
 
 plugin "aws" {
     enabled = true
-    version = "0.41.0"
+    version = "0.42.0"
     source  = "github.com/terraform-linters/tflint-ruleset-aws"
 }
diff --git a/main.tf b/main.tf
@@ -133,7 +133,7 @@ locals {
       runners_name                   = var.runner_instance.name
       runners_token                  = var.runner_gitlab.registration_token
       runners_executor               = var.runner_worker.type
-      runners_limit                  = var.runner_worker.max_jobs
+      runners_limit                  = var.runner_worker.type == "docker-autoscaler" ? var.runner_worker.max_jobs * var.runner_worker_docker_autoscaler.capacity_per_instance : var.runner_worker.max_jobs
       runners_concurrent             = var.runner_manager.maximum_concurrent_jobs
       runners_environment_vars       = jsonencode(var.runner_worker.environment_variables)
       runners_pre_build_script       = var.runner_worker_gitlab_pipeline.pre_build_script
diff --git a/modules/terminate-agent-hook/lambda/requirements.txt b/modules/terminate-agent-hook/lambda/requirements.txt
@@ -1,2 +1,2 @@
-boto3 ==1.40.1
-botocore ==1.40.1
+boto3 ==1.40.6
+botocore ==1.40.6

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@ plugin "terraform" {`
`5`	`5`
`6`	`6`	`plugin "aws" {`
`7`	`7`	`enabled = true`
`8`		`- version = "0.41.0"`
	`8`	`+ version = "0.42.0"`
`9`	`9`	`source = "github.com/terraform-linters/tflint-ruleset-aws"`
`10`	`10`	`}`