Skip to content

Commit 3158ebe

Browse files
tcnghiamgreau
tcnghia
authored and
mgreau
committed
[create-pull-request] automated change
1 parent 8a5b93a commit 3158ebe

13 files changed

Lines changed: 90 additions & 50 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module chainguard.dev/terraform-infra-reconcilers
33
go 1.25.7
44

55
require (
6-
chainguard.dev/driftlessaf v0.0.0-20260127033538-1be87f1b1ce2
6+
chainguard.dev/driftlessaf v0.4.0
77
chainguard.dev/go-grpc-kit v0.17.17
88
cloud.google.com/go/storage v1.59.1
99
github.com/chainguard-dev/clog v1.8.0
10-
github.com/chainguard-dev/terraform-infra-common v0.10.2
10+
github.com/chainguard-dev/terraform-infra-common v1.0.3
1111
github.com/cloudevents/sdk-go/v2 v2.16.2
1212
github.com/google/go-github/v84 v84.0.0
1313
github.com/sethvargo/go-envconfig v1.3.0
@@ -103,9 +103,3 @@ require (
103103
google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
104104
google.golang.org/protobuf v1.36.11 // indirect
105105
)
106-
107-
replace chainguard.dev/driftlessaf => ../go-driftlessaf
108-
109-
replace chainguard.dev/sdk => ../../public/sdk
110-
111-
replace github.com/chainguard-dev/terraform-infra-common => ../terraform-infra-common

‎go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
22
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
3+
chainguard.dev/driftlessaf v0.4.0 h1:fC8XYLHIvX4ibDdCc6Phurlh7RwezXmotuPSdRgdAfw=
4+
chainguard.dev/driftlessaf v0.4.0/go.mod h1:6Cj0egIjielry+wVUQRLAyOms9+5zilN9a64F//Av6k=
35
chainguard.dev/go-grpc-kit v0.17.17 h1:Jwhc0zyUwQbC2hNcsi+YMeUX/JUnM+dXVCkTw6wtPzs=
46
chainguard.dev/go-grpc-kit v0.17.17/go.mod h1:qn0meP6RtrbLicE1bgBZnnVU9dvX95eLs0x0T6kZ+b4=
7+
chainguard.dev/sdk v0.1.50 h1:rCoIYf30+ledJdaChqHVi2vh1BwIaWdVLjPfuPGdQ80=
8+
chainguard.dev/sdk v0.1.50/go.mod h1:rH1bz4Kqs4JTrKUbJoPUGX9SRNI5PJCRyvRXWVP3MY0=
59
cloud.google.com/go v0.123.0 h1:2NAUJwPR47q+E35uaJeYoNhuNEM9kM8SjgRgdeOJUSE=
610
cloud.google.com/go v0.123.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
711
cloud.google.com/go/auth v0.18.2 h1:+Nbt5Ev0xEqxlNjd6c+yYUeosQ5TtEUaNcN/3FozlaM=
@@ -46,6 +50,8 @@ github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UF
4650
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
4751
github.com/chainguard-dev/clog v1.8.0 h1:frlTMEdg3XQR+ioQ6O9i92uigY8GTUcWKpuCFkhcCHA=
4852
github.com/chainguard-dev/clog v1.8.0/go.mod h1:5MQOZi+Iu7fV7GcJG8ag8rCB5elEOpqRMKEASgnGVdo=
53+
github.com/chainguard-dev/terraform-infra-common v1.0.3 h1:/StmUb0fthwCGFmVFH5L1tXBzXsJpixvYPS4jBC+Qxs=
54+
github.com/chainguard-dev/terraform-infra-common v1.0.3/go.mod h1:gjJ84ImXYumgSyEmDmATWGwQ0pIwJVg7rzERwRa1ZFU=
4955
github.com/cloudevents/sdk-go/v2 v2.16.2 h1:ZYDFrYke4FD+jM8TZTJJO6JhKHzOQl2oqpFK1D+NnQM=
5056
github.com/cloudevents/sdk-go/v2 v2.16.2/go.mod h1:laOcGImm4nVJEU+PHnUrKL56CKmRL65RlQF0kRmW/kg=
5157
github.com/cncf/xds/go v0.0.0-20251210132809-ee656c7534f5 h1:6xNmx7iTtyBRev0+D/Tv1FZd4SCg8axKApyNyRsAt/w=

‎modules/cloudevents-workqueue/main.tf‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resource "google_service_account" "subscriber" {
1717

1818
// Deploy the subscriber service
1919
module "subscriber" {
20-
source = "../../../../public/terraform-infra-common/modules/regional-go-service"
20+
source = "chainguard-dev/common/infra//modules/regional-go-service"
2121

2222
project_id = var.project_id
2323
name = var.name
@@ -54,18 +54,20 @@ module "subscriber" {
5454
]
5555
}
5656
}
57+
version = "1.0.3"
5758
}
5859

5960
// Authorize the subscriber to call the workqueue in each region
6061
module "subscriber-calls-workqueue" {
6162
for_each = var.regions
6263

63-
source = "../../../../public/terraform-infra-common/modules/authorize-private-service"
64+
source = "chainguard-dev/common/infra//modules/authorize-private-service"
6465

6566
project_id = var.project_id
6667
region = each.key
6768
name = var.workqueue.name
6869
service-account = google_service_account.subscriber.email
70+
version = "1.0.3"
6971
}
7072

7173
// Create a subscription to the broker with filters for the specified event types
@@ -81,7 +83,7 @@ module "trigger" {
8183
}
8284
}
8385

84-
source = "../../../../public/terraform-infra-common/modules/cloudevent-trigger"
86+
source = "chainguard-dev/common/infra//modules/cloudevent-trigger"
8587

8688
project_id = var.project_id
8789
name = "${var.name}-${each.value.region}-${each.value.index}"
@@ -106,4 +108,5 @@ module "trigger" {
106108
team = var.team
107109

108110
depends_on = [module.subscriber]
111+
version = "1.0.3"
109112
}

‎modules/dashboard/reconciler/dashboard.tf‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ locals {
1010

1111
// Workqueue metrics section
1212
module "workqueue-state" {
13-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/workqueue"
13+
source = "chainguard-dev/common/infra//modules/dashboard/sections/workqueue"
1414

1515
title = "Workqueue State"
1616
service_name = local.workqueue_name
@@ -19,73 +19,85 @@ module "workqueue-state" {
1919
shards = var.shards
2020
filter = []
2121
collapsed = false
22+
version = "1.0.3"
2223
}
2324

2425
// Reconciler service sections
2526
module "errgrp" {
26-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/errgrp"
27+
source = "chainguard-dev/common/infra//modules/dashboard/sections/errgrp"
2728
title = "Reconciler Error Reporting"
2829
project_id = var.project_id
2930
service_name = local.service_name
3031
collapsed = true
32+
version = "1.0.3"
3133
}
3234

3335
module "reconciler-logs" {
34-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/logs"
36+
source = "chainguard-dev/common/infra//modules/dashboard/sections/logs"
3537
title = "Reconciler Logs"
3638
filter = ["resource.labels.service_name=\"${local.service_name}\""]
3739
cloudrun_type = "service"
40+
version = "1.0.3"
3841
}
3942

4043
module "http" {
41-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/http"
44+
source = "chainguard-dev/common/infra//modules/dashboard/sections/http"
4245
title = "HTTP"
4346
filter = []
4447
service_name = local.service_name
48+
version = "1.0.3"
4549
}
4650

4751
module "grpc" {
48-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/grpc"
52+
source = "chainguard-dev/common/infra//modules/dashboard/sections/grpc"
4953
title = "GRPC"
5054
filter = []
5155
service_name = local.service_name
56+
version = "1.0.3"
5257
}
5358

5459
module "github" {
55-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/github"
56-
title = "GitHub API"
57-
filter = []
60+
source = "chainguard-dev/common/infra//modules/dashboard/sections/github"
61+
title = "GitHub API"
62+
filter = []
63+
version = "1.0.3"
5864
}
5965

6066
module "agents" {
61-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/agents"
67+
source = "chainguard-dev/common/infra//modules/dashboard/sections/agents"
6268
title = "Agent Metrics"
6369
filter = [
6470
"metric.label.\"service_name\"=\"${local.service_name}\""
6571
]
72+
version = "1.0.3"
6673
}
6774

6875
module "resources" {
69-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/resources"
76+
source = "chainguard-dev/common/infra//modules/dashboard/sections/resources"
7077
title = "Reconciler Resources"
7178
filter = []
7279
cloudrun_name = local.service_name
7380
cloudrun_type = "service"
7481
notification_channels = var.notification_channels
82+
version = "1.0.3"
7583
}
7684

7785
module "alerts" {
7886
for_each = var.alerts
7987

80-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/alerts"
81-
alert = each.value
82-
title = "Alert: ${each.key}"
88+
source = "chainguard-dev/common/infra//modules/dashboard/sections/alerts"
89+
alert = each.value
90+
title = "Alert: ${each.key}"
91+
version = "1.0.3"
8392
}
8493

85-
module "width" { source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/width" }
94+
module "width" {
95+
source = "chainguard-dev/common/infra//modules/dashboard/sections/width"
96+
version = "1.0.3"
97+
}
8698

8799
module "layout" {
88-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/layout"
100+
source = "chainguard-dev/common/infra//modules/dashboard/sections/layout"
89101
sections = concat(
90102
[for x in keys(var.alerts) : module.alerts[x].section],
91103
[
@@ -99,10 +111,11 @@ module "layout" {
99111
var.sections.agents ? [module.agents.section] : [],
100112
[module.resources.section],
101113
)
114+
version = "1.0.3"
102115
}
103116

104117
module "dashboard" {
105-
source = "../../../../../public/terraform-infra-common/modules/dashboard"
118+
source = "chainguard-dev/common/infra//modules/dashboard"
106119

107120
object = {
108121
displayName = "Reconciler: ${var.name}"
@@ -131,4 +144,5 @@ module "dashboard" {
131144
tiles = module.layout.tiles,
132145
}
133146
}
147+
version = "1.0.3"
134148
}

‎modules/dashboard/workqueue/dashboard.tf‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module "workqueue-state" {
2-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/workqueue"
2+
source = "chainguard-dev/common/infra//modules/dashboard/sections/workqueue"
33

44
title = "Workqueue State"
55
service_name = var.name
@@ -8,34 +8,41 @@ module "workqueue-state" {
88
shards = var.shards
99
filter = []
1010
collapsed = false
11+
version = "1.0.3"
1112
}
1213

1314
module "receiver-logs" {
14-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/logs"
15+
source = "chainguard-dev/common/infra//modules/dashboard/sections/logs"
1516
title = "Receiver Logs"
1617
filter = ["resource.labels.service_name=\"${var.name}-rcv\""]
1718
cloudrun_type = "service"
19+
version = "1.0.3"
1820
}
1921

2022
module "dispatcher-logs" {
21-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/logs"
23+
source = "chainguard-dev/common/infra//modules/dashboard/sections/logs"
2224
title = "Dispatcher Logs"
2325
filter = ["resource.labels.service_name=\"${var.name}-dsp\""]
2426
cloudrun_type = "service"
27+
version = "1.0.3"
2528
}
2629

2730
module "alerts" {
2831
for_each = var.alerts
2932

30-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/alerts"
31-
alert = each.value
32-
title = "Alert: ${each.key}"
33+
source = "chainguard-dev/common/infra//modules/dashboard/sections/alerts"
34+
alert = each.value
35+
title = "Alert: ${each.key}"
36+
version = "1.0.3"
3337
}
3438

35-
module "width" { source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/width" }
39+
module "width" {
40+
source = "chainguard-dev/common/infra//modules/dashboard/sections/width"
41+
version = "1.0.3"
42+
}
3643

3744
module "layout" {
38-
source = "../../../../../public/terraform-infra-common/modules/dashboard/sections/layout"
45+
source = "chainguard-dev/common/infra//modules/dashboard/sections/layout"
3946

4047
sections = concat(
4148
[for x in keys(var.alerts) : module.alerts[x].section],
@@ -45,10 +52,11 @@ module "layout" {
4552
module.dispatcher-logs.section,
4653
]
4754
)
55+
version = "1.0.3"
4856
}
4957

5058
module "dashboard" {
51-
source = "../../../../../public/terraform-infra-common/modules/dashboard"
59+
source = "chainguard-dev/common/infra//modules/dashboard"
5260

5361
object = {
5462
displayName = "Cloud Workqueue: ${var.name}"
@@ -90,4 +98,5 @@ module "dashboard" {
9098
tiles = module.layout.tiles,
9199
}
92100
}
101+
version = "1.0.3"
93102
}

‎modules/github-path-reconciler/cron.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ locals {
1313
}
1414

1515
module "cron" {
16-
source = "../../../../public/terraform-infra-common/modules/cron"
16+
source = "chainguard-dev/common/infra//modules/cron"
1717

1818
name = "${var.name}-enq"
1919
project_id = var.project_id
@@ -52,4 +52,5 @@ module "cron" {
5252
labels = var.labels
5353
team = var.team
5454
product = var.product
55+
version = "1.0.3"
5556
}

‎modules/github-path-reconciler/main.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ module "reconciler" {
3838
# This is used by both the cron job and push listener
3939
module "authorize-receiver-per-region" {
4040
for_each = var.regions
41-
source = "../../../../public/terraform-infra-common/modules/authorize-private-service"
41+
source = "chainguard-dev/common/infra//modules/authorize-private-service"
4242

4343
project_id = var.project_id
4444
region = each.key
4545
name = module.reconciler.receiver.name
4646

4747
service-account = var.service_account
48+
version = "1.0.3"
4849
}

‎modules/github-path-reconciler/push-listener.tf‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
44
*/
55

66
module "push-listener" {
7-
source = "../../../../public/terraform-infra-common/modules/regional-go-service"
7+
source = "chainguard-dev/common/infra//modules/regional-go-service"
88

99
name = "${var.name}-push"
1010
project_id = var.project_id
@@ -50,6 +50,7 @@ module "push-listener" {
5050
labels = var.labels
5151
product = var.product
5252
team = var.team
53+
version = "1.0.3"
5354
}
5455

5556
# Subscribe to push events for each (repo, region) pair
@@ -63,7 +64,7 @@ module "push-subscription" {
6364
}
6465
}
6566

66-
source = "../../../../public/terraform-infra-common/modules/cloudevent-trigger"
67+
source = "chainguard-dev/common/infra//modules/cloudevent-trigger"
6768

6869
name = "${var.name}-push"
6970
broker = var.broker[each.value.region]
@@ -85,4 +86,5 @@ module "push-subscription" {
8586
notification_channels = var.notification_channels
8687

8788
depends_on = [module.push-listener]
89+
version = "1.0.3"
8890
}

‎modules/regional-go-reconciler/main.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ module "workqueue-sharded" {
8383

8484
// Stand up the reconciler service
8585
module "reconciler" {
86-
source = "../../../../public/terraform-infra-common/modules/regional-go-service"
86+
source = "chainguard-dev/common/infra//modules/regional-go-service"
8787

8888
project_id = var.project_id
8989
name = "${var.name}-rec"
@@ -111,4 +111,5 @@ module "reconciler" {
111111
slo = var.slo
112112

113113
notification_channels = var.notification_channels
114+
version = "1.0.3"
114115
}

0 commit comments

Comments
 (0)