update logpush to delete instant-logs for kind

Author: ssicard

integration/v4_to_v5/testdata/logpush_job/expected/logpush_job.tf

@@ -49,12 +49,11 @@ resource "cloudflare_logpush_job" "with_cve_field" {
   }
 }
 
-# Job with instant-logs kind (should become empty string)
+# Job with instant-logs kind (should be removed)
 resource "cloudflare_logpush_job" "instant_logs" {
   zone_id          = var.cloudflare_zone_id
   dataset          = "http_requests"
   destination_conf = "https://logpush-receiver.sd.cfplat.com"
-  kind             = ""
 }
 
 # Job with edge kind (should be preserved)
@@ -65,12 +64,19 @@ resource "cloudflare_logpush_job" "edge_logs" {
   kind             = "edge"
 }
 
+# Job with "" kind (should be preserved)
+resource "cloudflare_logpush_job" "edge_logs" {
+  zone_id          = var.cloudflare_zone_id
+  dataset          = "http_requests"
+  destination_conf = "https://logpush-receiver.sd.cfplat.com"
+  kind             = ""
+}
+
 # Full featured job with all transformations
 resource "cloudflare_logpush_job" "full" {
   zone_id          = var.cloudflare_zone_id
   dataset          = "http_requests"
   destination_conf = "https://logpush-receiver.sd.cfplat.com"
-  kind             = ""
   enabled          = true
   name             = "my-logpush-job"
   frequency        = "high"

integration/v4_to_v5/testdata/logpush_job/expected/terraform.tfstate

@@ -111,8 +111,7 @@
             "account_id": "f037e56e89293a057740de681ac9abbe",
             "dataset": "http_requests",
             "destination_conf": "https://logpush-receiver.sd.cfplat.com",
-            "enabled": true,
-            "kind": ""
+            "enabled": true
           }
         }
       ]
@@ -150,7 +149,6 @@
             "dataset": "http_requests",
             "destination_conf": "https://logpush-receiver.sd.cfplat.com",
             "enabled": true,
-            "kind": "",
             "name": "my-logpush-job",
             "frequency": "high",
             "max_upload_bytes": 5000000.0,

integration/v4_to_v5/testdata/logpush_job/input/logpush_job.tf

@@ -39,7 +39,7 @@ resource "cloudflare_logpush_job" "with_cve_field" {
   }
 }
 
-# Job with instant-logs kind (should become empty string)
+# Job with instant-logs kind (should be removed)
 resource "cloudflare_logpush_job" "instant_logs" {
   zone_id          = var.cloudflare_zone_id
   dataset          = "http_requests"
@@ -55,6 +55,14 @@ resource "cloudflare_logpush_job" "edge_logs" {
   kind             = "edge"
 }
 
+# Job with "" kind (should be preserved)
+resource "cloudflare_logpush_job" "edge_logs" {
+  zone_id          = var.cloudflare_zone_id
+  dataset          = "http_requests"
+  destination_conf = "https://logpush-receiver.sd.cfplat.com"
+  kind             = ""
+}
+
 # Full featured job with all transformations
 resource "cloudflare_logpush_job" "full" {
   zone_id          = var.cloudflare_zone_id

internal/resources/logpush_job/v4_to_v5.go

@@ -54,16 +54,13 @@ func (m *V4ToV5Migrator) TransformConfig(ctx *transform.Context, block *hclwrite
 		tfhcl.ConvertSingleBlockToAttribute(body, "output_options", "output_options")
 	}
 
-	// 2. Handle kind = "instant-logs" → kind = ""
-	// "instant-logs" is no longer valid in v5, convert to empty string
+	// 2. Handle kind = "instant-logs" → remove attribute
+	// "instant-logs" is no longer valid in v5, remove the attribute entirely
 	if kindAttr := body.GetAttribute("kind"); kindAttr != nil {
 		kindValue := tfhcl.ExtractStringFromAttribute(kindAttr)
 		if kindValue == "instant-logs" {
-			// Set to empty string (default in v5)
-			tokens := hcl.TokensForSimpleValue("")
-			if tokens != nil {
-				body.SetAttributeRaw("kind", tokens)
-			}
+			// Remove the attribute entirely since instant-logs is not valid in v5
+			body.RemoveAttribute("kind")
 		}
 	}
 
@@ -120,9 +117,10 @@ func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.
 	result = state.RemoveFields(result, "attributes", attrs,
 		"error_message", "last_complete", "last_error")
 
-	// 4. Handle kind value change: "instant-logs" → ""
+	// 4. Handle kind value change: "instant-logs" → remove attribute
+	// "instant-logs" is no longer valid in v5, remove it entirely
 	if kind := attrs.Get("kind"); kind.Exists() && kind.String() == "instant-logs" {
-		result, _ = sjson.Set(result, "attributes.kind", "")
+		result, _ = sjson.Delete(result, "attributes.kind")
 	}
 
 	return result, nil

internal/resources/logpush_job/v4_to_v5_test.go

@@ -147,7 +147,7 @@ func TestV4ToV5Transformation(t *testing.T) {
 }`,
 			},
 			{
-				Name: "Handle kind instant-logs to empty string",
+				Name: "Handle kind instant-logs by removing attribute",
 				Input: `resource "cloudflare_logpush_job" "example" {
   dataset          = "http_requests"
   destination_conf = "s3://mybucket/logs?region=us-west-2"
@@ -156,7 +156,6 @@ func TestV4ToV5Transformation(t *testing.T) {
 				Expected: `resource "cloudflare_logpush_job" "example" {
   dataset          = "http_requests"
   destination_conf = "s3://mybucket/logs?region=us-west-2"
-  kind             = ""
 }`,
 			},
 			{
@@ -208,7 +207,6 @@ func TestV4ToV5Transformation(t *testing.T) {
   account_id       = "abc123"
   dataset          = "http_requests"
   destination_conf = "s3://mybucket/logs?region=us-west-2"
-  kind             = ""
   enabled          = true
 
   output_options = {
@@ -249,7 +247,6 @@ resource "cloudflare_logpush_job" "job2" {
 				Expected: `resource "cloudflare_logpush_job" "job1" {
   dataset          = "http_requests"
   destination_conf = "s3://bucket1/logs?region=us-west-2"
-  kind             = ""
 
   output_options = {
     output_type       = "ndjson"
@@ -539,7 +536,7 @@ resource "cloudflare_logpush_job" "job2" {
 }`,
 			},
 			{
-				Name: "Handle kind instant-logs to empty string",
+				Name: "Handle kind instant-logs by removing attribute",
 				Input: `{
   "attributes": {
     "dataset": "http_requests",
@@ -550,8 +547,7 @@ resource "cloudflare_logpush_job" "job2" {
 				Expected: `{
   "attributes": {
     "dataset": "http_requests",
-    "destination_conf": "s3://mybucket/logs?region=us-west-2",
-    "kind": ""
+    "destination_conf": "s3://mybucket/logs?region=us-west-2"
   }
 }`,
 			},
@@ -639,7 +635,6 @@ resource "cloudflare_logpush_job" "job2" {
     "account_id": "abc123",
     "dataset": "http_requests",
     "destination_conf": "s3://mybucket/logs?region=us-west-2",
-    "kind": "",
     "enabled": true,
     "max_upload_bytes": 5000000.0,
     "max_upload_records": 1000.0,