Skip to content

Add scheduler for node-pack-extract backfill operation in Terraform #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2025
Merged

Add scheduler for node-pack-extract backfill operation in Terraform #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions infrastructure/examples/simple-node-pack-extract/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ output "topic_id" {
output "bucket_notification_id" {
value = module.node_pack_extract_trigger.bucket_notification_id
}
output "backfill_scheduler_id" {
value = module.node_pack_extract_trigger.backfill_scheduler_id
}
output "bucket_name" {
value = google_storage_bucket.bucket.name
}
output "service_account" {
value = google_service_account.service_account.email
}
19 changes: 19 additions & 0 deletions infrastructure/modules/node-pack-extract-trigger/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,22 @@ resource "google_cloudbuild_trigger" "trigger" {
_REGISTRY_BACKEND_URL = var.registry_backend_url
}
}


resource "google_cloud_scheduler_job" "backfill" {
name = var.backfill_job_name
description = "A job to trigger comfy node pack backfill."

schedule = var.backfill_job_schedule
paused = true

http_target {
http_method = "POST"
uri = "${var.registry_backend_url}/comfy-nodes/backfill"

oidc_token {
service_account_email = data.google_service_account.cloudbuild_service_account.email
audience = var.registry_backend_url
}
}
}
4 changes: 4 additions & 0 deletions infrastructure/modules/node-pack-extract-trigger/output.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@ output "bucket_notification_id" {
output "trigger_id" {
value = google_cloudbuild_trigger.trigger.id
}

output "backfill_scheduler_id" {
value = google_cloud_scheduler_job.backfill.id
}
12 changes: 12 additions & 0 deletions infrastructure/modules/node-pack-extract-trigger/variable.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ variable "trigger_name" {
default = "comfy-node-pack-extract"
}

variable "backfill_job_name" {
type = string
description = "Cloud build trigger name"
default = "comfy-node-pack-backfill"
}

variable "backfill_job_schedule" {
type = string
description = "Cron schedule for backfill job in UTC. Default is 3:30am on the 29th of february UTC."
default = "30 3 29 2 *"
}

variable "git_repo_uri" {
type = string
description = "Connected git repo containing the cloud build pipeline. See https://cloud.google.com/build/docs/repositories"
Expand Down
11 changes: 7 additions & 4 deletions node-pack-extract/test/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@ module test

go 1.23.2

require github.com/gruntwork-io/terratest v0.48.1
require (
cloud.google.com/go/cloudbuild v1.19.0
cloud.google.com/go/scheduler v1.11.2
cloud.google.com/go/storage v1.47.0
github.com/gruntwork-io/terratest v0.48.1
github.com/stretchr/testify v1.9.0
)

require (
cel.dev/expr v0.16.1 // indirect
cloud.google.com/go v0.116.0 // indirect
cloud.google.com/go/auth v0.10.2 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.5 // indirect
cloud.google.com/go/cloudbuild v1.19.0 // indirect
cloud.google.com/go/compute/metadata v0.5.2 // indirect
cloud.google.com/go/iam v1.2.2 // indirect
cloud.google.com/go/longrunning v0.6.2 // indirect
cloud.google.com/go/monitoring v1.21.2 // indirect
cloud.google.com/go/storage v1.47.0 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.24.1 // indirect
github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/metric v0.48.1 // indirect
Expand Down Expand Up @@ -127,7 +131,6 @@ require (
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/testify v1.9.0 // indirect
github.com/tmccombs/hcl2json v0.6.4 // indirect
github.com/ulikunitz/xz v0.5.10 // indirect
github.com/urfave/cli v1.22.16 // indirect
Expand Down
2 changes: 2 additions & 0 deletions node-pack-extract/test/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ cloud.google.com/go/longrunning v0.6.2 h1:xjDfh1pQcWPEvnfjZmwjKQEcHnpz6lHjfy7Fo0
cloud.google.com/go/longrunning v0.6.2/go.mod h1:k/vIs83RN4bE3YCswdXC5PFfWVILjm3hpEUlSko4PiI=
cloud.google.com/go/monitoring v1.21.2 h1:FChwVtClH19E7pJ+e0xUhJPGksctZNVOk2UhMmblmdU=
cloud.google.com/go/monitoring v1.21.2/go.mod h1:hS3pXvaG8KgWTSz+dAdyzPrGUYmi2Q+WFX8g2hqVEZU=
cloud.google.com/go/scheduler v1.11.2 h1:PfkvJP1qKu9NvFB65Ja/s918bPZWMBcYkg35Ljdw1Oc=
cloud.google.com/go/scheduler v1.11.2/go.mod h1:GZSv76T+KTssX2I9WukIYQuQRf7jk1WI+LOcIEHUUHk=
cloud.google.com/go/storage v1.47.0 h1:ajqgt30fnOMmLfWfu1PWcb+V9Dxz6n+9WKjdNg5R4HM=
cloud.google.com/go/storage v1.47.0/go.mod h1:Ks0vP374w0PW6jOUameJbapbQKXqkjGd/OJRp2fb9IQ=
cloud.google.com/go/trace v1.11.2 h1:4ZmaBdL8Ng/ajrgKqY5jfvzqMXbrDcBsUGXOT9aqTtI=
Expand Down
25 changes: 24 additions & 1 deletion node-pack-extract/test/trigger_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@ package test

import (
"context"
"net/http"
"strings"
"testing"

"cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
cloudscheduler "cloud.google.com/go/scheduler/apiv1"
"cloud.google.com/go/scheduler/apiv1/schedulerpb"
"cloud.google.com/go/storage"

"github.com/gruntwork-io/terratest/modules/environment"
"github.com/gruntwork-io/terratest/modules/gcp"
"github.com/gruntwork-io/terratest/modules/random"
Expand All @@ -33,8 +37,10 @@ func TestApply(t *testing.T) {

topicID := terraform.Output(t, terraformOptions, "topic_id")
triggerID := terraform.Output(t, terraformOptions, "trigger_id")
bucketName := terraform.Output(t, terraformOptions, "bucket_name")
bucketNotificationID := terraform.Output(t, terraformOptions, "bucket_notification_id")
schedulerID := terraform.Output(t, terraformOptions, "backfill_scheduler_id")
bucketName := terraform.Output(t, terraformOptions, "bucket_name")
serviceAccount := terraform.Output(t, terraformOptions, "service_account")

t.Run("CheckCloudBuildTrigger", func(t *testing.T) {
gcb := gcp.NewCloudBuildService(t)
Expand Down Expand Up @@ -63,4 +69,21 @@ func TestApply(t *testing.T) {
}
assert.True(t, found)
})

t.Run("CheckScheduler", func(t *testing.T) {
client, err := cloudscheduler.NewCloudSchedulerClient(context.Background())
require.NoError(t, err)
defer client.Close()

j, err := client.GetJob(context.Background(), &schedulerpb.GetJobRequest{
Name: schedulerID,
})
require.NoError(t, err)
h := j.GetHttpTarget()
require.NotNil(t, h)
assert.Contains(t, h.GetUri(), "/comfy-nodes/backfill")
assert.Equal(t, http.MethodPost, h.GetHttpMethod().String())
assert.Equal(t, "https://stagingapi.comfy.org", h.GetOidcToken().GetAudience())
assert.Equal(t, serviceAccount, h.GetOidcToken().GetServiceAccountEmail())
})
}
Loading