Sort and distinct entries for automatically discovered environment variables (#4487)

jeanschmidt · web-flow · commit ed21cc6f91b1 · 2023-08-17T15:52:13.000+02:00
diff --git a/terraform-aws-github-runner/modules/runners/scale-down.tf b/terraform-aws-github-runner/modules/runners/scale-down.tf
@@ -46,14 +46,14 @@ resource "aws_lambda_function" "scale_down" {
       SECRETSMANAGER_SECRETS_ID       = var.secretsmanager_secrets_id
       AWS_REGIONS_TO_VPC_IDS = join(
         ",",
-        [
+        sort(distinct([
           for region_vpc in var.vpc_ids :
           format("%s|%s", region_vpc.region, region_vpc.vpc)
-        ]
+        ]))
       )
       VPC_ID_TO_SECURITY_GROUP_IDS = join(
         ",",
-        concat(
+        sort(distinct(concat(
           [
             for vpc in var.vpc_ids :
             format(
@@ -66,21 +66,21 @@ resource "aws_lambda_function" "scale_down" {
             for vpc_subnet in var.vpc_sgs :
             format("%s|%s", vpc_subnet.vpc, vpc_subnet.sg)
           ]
-        )
+        )))
       )
       VPC_ID_TO_SUBNET_IDS = join(
         ",",
-        [
+        sort(distinct([
           for vpc_subnet in var.subnet_vpc_ids :
           format("%s|%s", vpc_subnet.vpc, vpc_subnet.subnet)
-        ]
+        ]))
       )
       SUBNET_ID_TO_AZ = join(
         ",",
-        [
+        sort(distinct([
           for subnet_az in var.subnet_azs :
           format("%s|%s", subnet_az.subnet, subnet_az.az)
-        ]
+        ]))
       )
     }
   }
diff --git a/terraform-aws-github-runner/modules/runners/scale-up.tf b/terraform-aws-github-runner/modules/runners/scale-up.tf
@@ -58,14 +58,14 @@ resource "aws_lambda_function" "scale_up" {
 
       AWS_REGIONS_TO_VPC_IDS = join(
         ",",
-        [
+        sort(distinct([
           for region_vpc in var.vpc_ids :
           format("%s|%s", region_vpc.region, region_vpc.vpc)
-        ]
+        ]))
       )
       VPC_ID_TO_SECURITY_GROUP_IDS = join(
         ",",
-        concat(
+        sort(distinct(concat(
           [
             for vpc in var.vpc_ids :
             format(
@@ -78,21 +78,21 @@ resource "aws_lambda_function" "scale_up" {
             for vpc_subnet in var.vpc_sgs :
             format("%s|%s", vpc_subnet.vpc, vpc_subnet.sg)
           ]
-        )
+        )))
       )
       VPC_ID_TO_SUBNET_IDS = join(
         ",",
-        [
+        sort(distinct([
           for vpc_subnet in var.subnet_vpc_ids :
           format("%s|%s", vpc_subnet.vpc, vpc_subnet.subnet)
-        ]
+        ]))
       )
       SUBNET_ID_TO_AZ = join(
         ",",
-        [
+        sort(distinct([
           for subnet_az in var.subnet_azs :
           format("%s|%s", subnet_az.subnet, subnet_az.az)
-        ]
+        ]))
       )
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -46,14 +46,14 @@ resource "aws_lambda_function" "scale_down" {`
`46`	`46`	`SECRETSMANAGER_SECRETS_ID = var.secretsmanager_secrets_id`
`47`	`47`	`AWS_REGIONS_TO_VPC_IDS = join(`
`48`	`48`	`",",`
`49`		`- [`
	`49`	`+ sort(distinct([`
`50`	`50`	`for region_vpc in var.vpc_ids :`
`51`	`51`	`format("%s\|%s", region_vpc.region, region_vpc.vpc)`
`52`		`- ]`
	`52`	`+ ]))`
`53`	`53`	`)`
`54`	`54`	`VPC_ID_TO_SECURITY_GROUP_IDS = join(`
`55`	`55`	`",",`
`56`		`- concat(`
	`56`	`+ sort(distinct(concat(`
`57`	`57`	`[`
`58`	`58`	`for vpc in var.vpc_ids :`
`59`	`59`	`format(`
`@@ -66,21 +66,21 @@ resource "aws_lambda_function" "scale_down" {`
`66`	`66`	`for vpc_subnet in var.vpc_sgs :`
`67`	`67`	`format("%s\|%s", vpc_subnet.vpc, vpc_subnet.sg)`
`68`	`68`	`]`
`69`		`- )`
	`69`	`+ )))`
`70`	`70`	`)`
`71`	`71`	`VPC_ID_TO_SUBNET_IDS = join(`
`72`	`72`	`",",`
`73`		`- [`
	`73`	`+ sort(distinct([`
`74`	`74`	`for vpc_subnet in var.subnet_vpc_ids :`
`75`	`75`	`format("%s\|%s", vpc_subnet.vpc, vpc_subnet.subnet)`
`76`		`- ]`
	`76`	`+ ]))`
`77`	`77`	`)`
`78`	`78`	`SUBNET_ID_TO_AZ = join(`
`79`	`79`	`",",`
`80`		`- [`
	`80`	`+ sort(distinct([`
`81`	`81`	`for subnet_az in var.subnet_azs :`
`82`	`82`	`format("%s\|%s", subnet_az.subnet, subnet_az.az)`
`83`		`- ]`
	`83`	`+ ]))`
`84`	`84`	`)`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ resource "aws_lambda_function" "scale_up" {`
`58`	`58`
`59`	`59`	`AWS_REGIONS_TO_VPC_IDS = join(`
`60`	`60`	`",",`
`61`		`- [`
	`61`	`+ sort(distinct([`
`62`	`62`	`for region_vpc in var.vpc_ids :`
`63`	`63`	`format("%s\|%s", region_vpc.region, region_vpc.vpc)`
`64`		`- ]`
	`64`	`+ ]))`
`65`	`65`	`)`
`66`	`66`	`VPC_ID_TO_SECURITY_GROUP_IDS = join(`
`67`	`67`	`",",`
`68`		`- concat(`
	`68`	`+ sort(distinct(concat(`
`69`	`69`	`[`
`70`	`70`	`for vpc in var.vpc_ids :`
`71`	`71`	`format(`
`@@ -78,21 +78,21 @@ resource "aws_lambda_function" "scale_up" {`
`78`	`78`	`for vpc_subnet in var.vpc_sgs :`
`79`	`79`	`format("%s\|%s", vpc_subnet.vpc, vpc_subnet.sg)`
`80`	`80`	`]`
`81`		`- )`
	`81`	`+ )))`
`82`	`82`	`)`
`83`	`83`	`VPC_ID_TO_SUBNET_IDS = join(`
`84`	`84`	`",",`
`85`		`- [`
	`85`	`+ sort(distinct([`
`86`	`86`	`for vpc_subnet in var.subnet_vpc_ids :`
`87`	`87`	`format("%s\|%s", vpc_subnet.vpc, vpc_subnet.subnet)`
`88`		`- ]`
	`88`	`+ ]))`
`89`	`89`	`)`
`90`	`90`	`SUBNET_ID_TO_AZ = join(`
`91`	`91`	`",",`
`92`		`- [`
	`92`	`+ sort(distinct([`
`93`	`93`	`for subnet_az in var.subnet_azs :`
`94`	`94`	`format("%s\|%s", subnet_az.subnet, subnet_az.az)`
`95`		`- ]`
	`95`	`+ ]))`
`96`	`96`	`)`
`97`	`97`	`}`
`98`	`98`	`}`