Skip to content

Commit d5b4cf5

Browse files
ssicardssicard
committed
add updated int tests after adding end to end test testting
1 parent 6f833e3 commit d5b4cf5

File tree

4 files changed

+63
-63
lines changed

4 files changed

+63
-63
lines changed

‎integration/v4_to_v5/testdata/managed_transforms/expected/managed_transforms.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Test Case 1: Basic configuration with request headers
22
resource "cloudflare_managed_transforms" "example_request" {
3-
zone_id = "d56084adb405e0b7e32c52321bf07be6"
3+
zone_id = var.cloudflare_zone_id
44

55

66
managed_request_headers = [{
@@ -15,7 +15,7 @@ resource "cloudflare_managed_transforms" "example_request" {
1515

1616
# Test Case 2: Basic configuration with response headers
1717
resource "cloudflare_managed_transforms" "example_response" {
18-
zone_id = "023e105f4ecef8ad9ca31a8372d0c353"
18+
zone_id = var.cloudflare_zone_id
1919

2020

2121
managed_request_headers = []
@@ -30,7 +30,7 @@ resource "cloudflare_managed_transforms" "example_response" {
3030

3131
# Test Case 3: Configuration with both request and response headers
3232
resource "cloudflare_managed_transforms" "example_both" {
33-
zone_id = "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6"
33+
zone_id = var.cloudflare_zone_id
3434

3535

3636
managed_request_headers = [{
@@ -45,7 +45,7 @@ resource "cloudflare_managed_transforms" "example_both" {
4545

4646
# Test Case 4: Minimal configuration with no headers
4747
resource "cloudflare_managed_transforms" "example_minimal" {
48-
zone_id = "z9y8x7w6v5u4t3s2r1q0p9o8n7m6l5k4"
48+
zone_id = var.cloudflare_zone_id
4949
managed_request_headers = []
5050
managed_response_headers = []
5151
}

‎integration/v4_to_v5/testdata/managed_transforms/input/managed_transforms.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Test Case 1: Basic configuration with request headers
22
resource "cloudflare_managed_headers" "example_request" {
3-
zone_id = "d56084adb405e0b7e32c52321bf07be6"
3+
zone_id = var.cloudflare_zone_id
44

55
managed_request_headers {
66
id = "add_true_client_ip_headers"
@@ -15,7 +15,7 @@ resource "cloudflare_managed_headers" "example_request" {
1515

1616
# Test Case 2: Basic configuration with response headers
1717
resource "cloudflare_managed_headers" "example_response" {
18-
zone_id = "023e105f4ecef8ad9ca31a8372d0c353"
18+
zone_id = var.cloudflare_zone_id
1919

2020
managed_response_headers {
2121
id = "remove_x-powered-by_header"
@@ -30,7 +30,7 @@ resource "cloudflare_managed_headers" "example_response" {
3030

3131
# Test Case 3: Configuration with both request and response headers
3232
resource "cloudflare_managed_headers" "example_both" {
33-
zone_id = "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6"
33+
zone_id = var.cloudflare_zone_id
3434

3535
managed_request_headers {
3636
id = "add_bot_protection_headers"
@@ -45,5 +45,5 @@ resource "cloudflare_managed_headers" "example_both" {
4545

4646
# Test Case 4: Minimal configuration with no headers
4747
resource "cloudflare_managed_headers" "example_minimal" {
48-
zone_id = "z9y8x7w6v5u4t3s2r1q0p9o8n7m6l5k4"
48+
zone_id = var.cloudflare_zone_id
4949
}

‎integration/v4_to_v5/testdata/managed_transforms/input/terraform.tfstate‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,105 @@
11
{
2-
"version": 4,
3-
"terraform_version": "1.0.0",
4-
"serial": 1,
52
"lineage": "b84c21a4-d553-5468-8b7d-341b3f34b531",
63
"outputs": {},
74
"resources": [
85
{
9-
"mode": "managed",
10-
"type": "cloudflare_managed_headers",
11-
"name": "example_request",
12-
"provider": "provider[\"registry.terraform.io/cloudflare/cloudflare\"]",
136
"instances": [
147
{
15-
"schema_version": 0,
168
"attributes": {
179
"id": "d56084adb405e0b7e32c52321bf07be6",
18-
"zone_id": "d56084adb405e0b7e32c52321bf07be6",
1910
"managed_request_headers": [
2011
{
21-
"id": "add_true_client_ip_headers",
22-
"enabled": true
12+
"enabled": true,
13+
"id": "add_true_client_ip_headers"
2314
},
2415
{
25-
"id": "add_visitor_location_headers",
26-
"enabled": false
16+
"enabled": false,
17+
"id": "add_visitor_location_headers"
2718
}
2819
],
29-
"managed_response_headers": []
30-
}
20+
"managed_response_headers": [],
21+
"zone_id": "d56084adb405e0b7e32c52321bf07be6"
22+
},
23+
"schema_version": 0
3124
}
32-
]
33-
},
34-
{
25+
],
3526
"mode": "managed",
36-
"type": "cloudflare_managed_headers",
37-
"name": "example_response",
27+
"name": "example_request",
3828
"provider": "provider[\"registry.terraform.io/cloudflare/cloudflare\"]",
29+
"type": "cloudflare_managed_transforms"
30+
},
31+
{
3932
"instances": [
4033
{
41-
"schema_version": 0,
4234
"attributes": {
4335
"id": "023e105f4ecef8ad9ca31a8372d0c353",
44-
"zone_id": "023e105f4ecef8ad9ca31a8372d0c353",
4536
"managed_request_headers": [],
4637
"managed_response_headers": [
4738
{
48-
"id": "remove_x-powered-by_header",
49-
"enabled": true
39+
"enabled": true,
40+
"id": "remove_x-powered-by_header"
5041
},
5142
{
52-
"id": "add_security_headers",
53-
"enabled": false
43+
"enabled": false,
44+
"id": "add_security_headers"
5445
}
55-
]
56-
}
46+
],
47+
"zone_id": "023e105f4ecef8ad9ca31a8372d0c353"
48+
},
49+
"schema_version": 0
5750
}
58-
]
59-
},
60-
{
51+
],
6152
"mode": "managed",
62-
"type": "cloudflare_managed_headers",
63-
"name": "example_both",
53+
"name": "example_response",
6454
"provider": "provider[\"registry.terraform.io/cloudflare/cloudflare\"]",
55+
"type": "cloudflare_managed_transforms"
56+
},
57+
{
6558
"instances": [
6659
{
67-
"schema_version": 0,
6860
"attributes": {
6961
"id": "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6",
70-
"zone_id": "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6",
7162
"managed_request_headers": [
7263
{
73-
"id": "add_bot_protection_headers",
74-
"enabled": true
64+
"enabled": true,
65+
"id": "add_bot_protection_headers"
7566
}
7667
],
7768
"managed_response_headers": [
7869
{
79-
"id": "remove_server_header",
80-
"enabled": true
70+
"enabled": true,
71+
"id": "remove_server_header"
8172
}
82-
]
83-
}
73+
],
74+
"zone_id": "a1b2c3d4e5f6g7h8i9j0k1l2m3n4o5p6"
75+
},
76+
"schema_version": 0
8477
}
85-
]
86-
},
87-
{
78+
],
8879
"mode": "managed",
89-
"type": "cloudflare_managed_headers",
90-
"name": "example_minimal",
80+
"name": "example_both",
9181
"provider": "provider[\"registry.terraform.io/cloudflare/cloudflare\"]",
82+
"type": "cloudflare_managed_transforms"
83+
},
84+
{
9285
"instances": [
9386
{
94-
"schema_version": 0,
9587
"attributes": {
9688
"id": "z9y8x7w6v5u4t3s2r1q0p9o8n7m6l5k4",
97-
"zone_id": "z9y8x7w6v5u4t3s2r1q0p9o8n7m6l5k4",
98-
"managed_request_headers": null,
99-
"managed_response_headers": null
100-
}
89+
"managed_request_headers": [],
90+
"managed_response_headers": [],
91+
"zone_id": "z9y8x7w6v5u4t3s2r1q0p9o8n7m6l5k4"
92+
},
93+
"schema_version": 0
10194
}
102-
]
95+
],
96+
"mode": "managed",
97+
"name": "example_minimal",
98+
"provider": "provider[\"registry.terraform.io/cloudflare/cloudflare\"]",
99+
"type": "cloudflare_managed_transforms"
103100
}
104-
]
105-
}
101+
],
102+
"serial": 1,
103+
"terraform_version": "1.0.0",
104+
"version": 4
105+
}

‎internal/resources/managed_transforms/v4_to_v5.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (m *V4ToV5Migrator) TransformConfig(ctx *transform.Context, block *hclwrite
5555
}, nil
5656
}
5757

58-
func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.Result, resourcePath string) (string, error) {
58+
func (m *V4ToV5Migrator) TransformState(ctx *transform.Context, stateJSON gjson.Result, resourcePath string, resourceName string) (string, error) {
5959
result := stateJSON.String()
6060

6161
// Get the attributes

0 commit comments

Comments
 (0)