Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
{
"type": "queue",
"name": "MY_QUEUE",
"queue_name": "cftftest-queue"
"queue": "cftftest-queue"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,14 @@ resource "cloudflare_workers_kv_namespace" "test_kv_multiple" {
title = "cftftest-kv-${count.index}"
}

# ========================================
# Dependencies - D1 Databases
# ========================================
# TODO: Uncomment when d1_database v4→v5 migration is created
# D1 bindings also require ES module format which adds complexity

# resource "cloudflare_d1_database" "test_d1" {
# account_id = var.cloudflare_account_id
# name = "cftftest-d1-database"
# }

# ========================================
# Dependencies - Queues
# ========================================
# TODO: Uncomment when queue v4→v5 migration is created
# The v4 schema uses 'name', v5 uses 'queue_name'
# Need to create: internal/resources/queue/v4_to_v5.go

# resource "cloudflare_queue" "test_queue" {
# account_id = var.cloudflare_account_id
# name = "cftftest-queue"
# }
resource "cloudflare_queue" "test_queue" {
account_id = var.cloudflare_account_id
queue_name = "cftftest-queue"
}

# ========================================
# Dependencies - R2 Buckets
Expand Down Expand Up @@ -180,18 +166,20 @@ resource "cloudflare_workers_script" "analytics_engine" {
# ========================================
# Pattern 8: Worker with queue_binding (binding → name, queue → queue_name)
# ========================================
# TODO: Uncomment when queue v4→v5 migration is created

# resource "cloudflare_workers_script" "queue" {
# account_id = var.cloudflare_account_id
# name = "cftftest-queue-worker"
# content = local.common_content
#
# queue_binding {
# binding = "MY_QUEUE"
# queue = cloudflare_queue.test_queue.name
# }
# }
resource "cloudflare_workers_script" "queue" {
account_id = var.cloudflare_account_id
content = local.common_content

script_name = "cftftest-queue-worker"
bindings = [
{
type = "queue"
name = "MY_QUEUE"
queue = cloudflare_queue.test_queue.queue_name
}
]
}

# ========================================
# Pattern 9: Worker with multiple bindings (order preservation test)
Expand Down Expand Up @@ -470,11 +458,6 @@ resource "cloudflare_workers_script" "dependent" {



# queue_binding commented out - requires queue v4→v5 migration
# queue_binding {
# binding = "JOBS"
# queue = cloudflare_queue.test_queue.name
# }
script_name = "cftftest-dependent-worker"
bindings = [
{
Expand All @@ -489,6 +472,10 @@ resource "cloudflare_workers_script" "dependent" {
type = "r2_bucket"
name = "STORAGE"
bucket_name = cloudflare_r2_bucket.test_r2.name
}, {
type = "queue"
name = "JOBS"
queue = cloudflare_queue.test_queue.queue_name
}
]
}
Expand Down Expand Up @@ -567,16 +554,8 @@ resource "cloudflare_workers_script" "environment" {



# dynamic queue_binding commented out - requires queue v4→v5 migration
# dynamic "queue_binding" {
# for_each = each.value.use_queue ? [1] : []
# content {
# binding = "ENV_QUEUE"
# queue = cloudflare_queue.test_queue.name
# }
# }
script_name = "cftftest-${each.key}-worker"
bindings = [
bindings = concat([
{
type = "plain_text"
name = "ENVIRONMENT"
Expand All @@ -586,5 +565,67 @@ resource "cloudflare_workers_script" "environment" {
name = "ENV_KV"
namespace_id = cloudflare_workers_kv_namespace.test_kv_multiple[each.value.kv_index].id
}
]
], each.value.use_queue ? [{
type = "queue"
name = "ENV_QUEUE"
queue = cloudflare_queue.test_queue.queue_name
}] : [])
}

# ========================================
# Pattern 28: Dynamic plain_text_binding
# Tests dynamic block transformation with plain_text binding type
# ========================================

variable "enable_debug_mode" {
type = bool
default = false
}

resource "cloudflare_workers_script" "dynamic_plain_text" {
account_id = var.cloudflare_account_id
content = local.common_content


script_name = "cftftest-dynamic-plain-text-worker"
bindings = concat([
{
type = "plain_text"
name = "STATIC_VAR"
text = "always-present"
}
], var.enable_debug_mode ? [{
type = "plain_text"
name = "DEBUG_MODE"
text = "enabled"
}] : [])
}

# ========================================
# Pattern 29: Dynamic kv_namespace_binding with conditional
# Tests dynamic block transformation with kv_namespace binding type
# ========================================

variable "enable_kv_cache" {
type = bool
default = true
}

resource "cloudflare_workers_script" "dynamic_kv" {
account_id = var.cloudflare_account_id
content = local.common_content


script_name = "cftftest-dynamic-kv-worker"
bindings = concat([
{
type = "plain_text"
name = "ALWAYS_PRESENT"
text = "yes"
}
], var.enable_kv_cache ? [{
type = "kv_namespace"
name = "KV_CACHE"
namespace_id = cloudflare_workers_kv_namespace.test_kv.id
}] : [])
}
125 changes: 83 additions & 42 deletions integration/v4_to_v5/testdata/workers_script/input/workers_script.tf
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,14 @@ resource "cloudflare_workers_kv_namespace" "test_kv_multiple" {
title = "cftftest-kv-${count.index}"
}

# ========================================
# Dependencies - D1 Databases
# ========================================
# TODO: Uncomment when d1_database v4→v5 migration is created
# D1 bindings also require ES module format which adds complexity

# resource "cloudflare_d1_database" "test_d1" {
# account_id = var.cloudflare_account_id
# name = "cftftest-d1-database"
# }

# ========================================
# Dependencies - Queues
# ========================================
# TODO: Uncomment when queue v4→v5 migration is created
# The v4 schema uses 'name', v5 uses 'queue_name'
# Need to create: internal/resources/queue/v4_to_v5.go

# resource "cloudflare_queue" "test_queue" {
# account_id = var.cloudflare_account_id
# name = "cftftest-queue"
# }
resource "cloudflare_queue" "test_queue" {
account_id = var.cloudflare_account_id
name = "cftftest-queue"
}

# ========================================
# Dependencies - R2 Buckets
Expand Down Expand Up @@ -165,18 +151,17 @@ resource "cloudflare_workers_script" "analytics_engine" {
# ========================================
# Pattern 8: Worker with queue_binding (binding → name, queue → queue_name)
# ========================================
# TODO: Uncomment when queue v4→v5 migration is created

# resource "cloudflare_workers_script" "queue" {
# account_id = var.cloudflare_account_id
# name = "cftftest-queue-worker"
# content = local.common_content
#
# queue_binding {
# binding = "MY_QUEUE"
# queue = cloudflare_queue.test_queue.name
# }
# }
resource "cloudflare_workers_script" "queue" {
account_id = var.cloudflare_account_id
name = "cftftest-queue-worker"
content = local.common_content

queue_binding {
binding = "MY_QUEUE"
queue = cloudflare_queue.test_queue.name
}
}

# ========================================
# Pattern 9: Worker with multiple bindings (order preservation test)
Expand Down Expand Up @@ -443,11 +428,10 @@ resource "cloudflare_workers_script" "dependent" {
bucket_name = cloudflare_r2_bucket.test_r2.name
}

# queue_binding commented out - requires queue v4→v5 migration
# queue_binding {
# binding = "JOBS"
# queue = cloudflare_queue.test_queue.name
# }
queue_binding {
binding = "JOBS"
queue = cloudflare_queue.test_queue.name
}
}

# ========================================
Expand Down Expand Up @@ -527,12 +511,69 @@ resource "cloudflare_workers_script" "environment" {
namespace_id = cloudflare_workers_kv_namespace.test_kv_multiple[each.value.kv_index].id
}

# dynamic queue_binding commented out - requires queue v4→v5 migration
# dynamic "queue_binding" {
# for_each = each.value.use_queue ? [1] : []
# content {
# binding = "ENV_QUEUE"
# queue = cloudflare_queue.test_queue.name
# }
# }
dynamic "queue_binding" {
for_each = each.value.use_queue ? [1] : []
content {
binding = "ENV_QUEUE"
queue = cloudflare_queue.test_queue.name
}
}
}

# ========================================
# Pattern 28: Dynamic plain_text_binding
# Tests dynamic block transformation with plain_text binding type
# ========================================

variable "enable_debug_mode" {
type = bool
default = false
}

resource "cloudflare_workers_script" "dynamic_plain_text" {
account_id = var.cloudflare_account_id
name = "cftftest-dynamic-plain-text-worker"
content = local.common_content

plain_text_binding {
name = "STATIC_VAR"
text = "always-present"
}

dynamic "plain_text_binding" {
for_each = var.enable_debug_mode ? [1] : []
content {
name = "DEBUG_MODE"
text = "enabled"
}
}
}

# ========================================
# Pattern 29: Dynamic kv_namespace_binding with conditional
# Tests dynamic block transformation with kv_namespace binding type
# ========================================

variable "enable_kv_cache" {
type = bool
default = true
}

resource "cloudflare_workers_script" "dynamic_kv" {
account_id = var.cloudflare_account_id
name = "cftftest-dynamic-kv-worker"
content = local.common_content

plain_text_binding {
name = "ALWAYS_PRESENT"
text = "yes"
}

dynamic "kv_namespace_binding" {
for_each = var.enable_kv_cache ? [1] : []
content {
name = "KV_CACHE"
namespace_id = cloudflare_workers_kv_namespace.test_kv.id
}
}
}
Loading