Modify input variable correctly

Comfy-Org · Dec 28, 2024 · 065b228 · 065b228
1 parent 6db9c20
commit 065b228
Show file tree

Hide file tree

Showing 25 changed files with 28 additions and 511 deletions.
diff --git a/infrastructure/environment/prod/.terraform.lock.hcl b/infrastructure/environment/prod/.terraform.lock.hcl
diff --git a/infrastructure/environment/prod/README.md b/infrastructure/environment/prod/README.md
diff --git a/infrastructure/environment/prod/main.tf b/infrastructure/environment/prod/main.tf
diff --git a/infrastructure/environment/prod/variable.tf b/infrastructure/environment/prod/variable.tf
diff --git a/infrastructure/environment/staging/README.md b/infrastructure/environment/staging/README.md
diff --git a/infrastructure/environment/staging/main.tf b/infrastructure/environment/staging/main.tf
diff --git a/infrastructure/environment/staging/variable.tf b/infrastructure/environment/staging/variable.tf
diff --git a/.../example/simple-node-pack-extract/main.tf → ...examples/simple-node-pack-extract/main.tf b/.../example/simple-node-pack-extract/main.tf → ...examples/simple-node-pack-extract/main.tf
@@ -40,6 +40,7 @@ module "node_pack_extract_trigger" {
   cloud_build_service_account = google_service_account.service_account.email
   topic_name                  = "${var.prefix}-comfy-registry-event"
   trigger_name                = "${var.prefix}-comfy-registry-event"
+  registry_backend_url        = "https://stagingapi.comfy.org"
 }
 
 output "trigger_id" {

diff --git a/infrastructure/module/node-pack-extract-trigger/README.md b/infrastructure/module/node-pack-extract-trigger/README.md
diff --git a/infrastructure/module/node-pack-extract-trigger/main.tf b/infrastructure/module/node-pack-extract-trigger/main.tf
diff --git a/infrastructure/module/node-pack-extract-trigger/variable.tf b/infrastructure/module/node-pack-extract-trigger/variable.tf
diff --git a/infrastructure/module/node-pack-extract-trigger/version.tf b/infrastructure/module/node-pack-extract-trigger/version.tf
diff --git a/infrastructure/modules/node-pack-extract-trigger/.terraform.lock.hcl b/infrastructure/modules/node-pack-extract-trigger/.terraform.lock.hcl
diff --git a/infrastructure/modules/node-pack-extract-trigger/README.md b/infrastructure/modules/node-pack-extract-trigger/README.md
@@ -5,5 +5,6 @@ Terraform modules to setup trigger for cloud build that will run [node-pack-extr
 ## Requirements
 
 - Google Cloud Account
-- Existing Google Cloud Storage bucket where the Registry backend store the comfy node packs.
-- Existing Service Account with `Service Account Token Creator` Role plus the one that is whitelisted in [service_account_auth](../../../server/middleware/authentication/service_account_auth.go#65) middleware.
+- Existing Google Cloud Storage public bucket where the Registry backend store the comfy node packs.
+- Existing Service Account that is whitelisted in [service_account_auth](../../../server/middleware/authentication/service_account_auth.go#65) middleware and with `Service Account Token Creator` Role.
+- [Connected repositories](https://cloud.google.com/build/docs/repositories) contains the [node-pack-extract](../../../node-pack-extract/) folder
diff --git a/infrastructure/modules/node-pack-extract-trigger/main.tf b/infrastructure/modules/node-pack-extract-trigger/main.tf
@@ -38,7 +38,7 @@ data "google_service_account" "cloudbuild_service_account" {
 
 # Create the cloud build trigger
 resource "google_cloudbuild_trigger" "trigger" {
-  name            = "comfy-registry-nodepack"
+  name            = var.trigger_name
   location        = var.region
   service_account = data.google_service_account.cloudbuild_service_account.id
 
@@ -60,8 +60,8 @@ resource "google_cloudbuild_trigger" "trigger" {
   }
 
   substitutions = {
-    _CUSTOM_NODE_NAME = "custom-node"
-    _CUSTOM_NODE_URL  = "https://storage.googleapis.com/$(body.message.data.bucket)/$(body.message.data.name)"
-    _NODEPACK_HANDLER = var.registry_backend_url
+    _CUSTOM_NODE_NAME     = "custom-node"
+    _CUSTOM_NODE_URL      = "https://storage.googleapis.com/$(body.message.data.bucket)/$(body.message.data.name)"
+    _REGISTRY_BACKEND_URL = var.registry_backend_url
   }
 }
diff --git a/...odule/node-pack-extract-trigger/output.tf → ...dules/node-pack-extract-trigger/output.tf b/...odule/node-pack-extract-trigger/output.tf → ...dules/node-pack-extract-trigger/output.tf