@gradientedge/cdk-utils 9.53.0 → 9.53.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (21) hide show
  1. package/dist/src/lib/cloudflare/services/access/main.js +8 -8
  2. package/dist/src/lib/cloudflare/services/api-shield/main.js +5 -5
  3. package/dist/src/lib/cloudflare/services/argo/main.js +2 -2
  4. package/dist/src/lib/cloudflare/services/filter/main.js +1 -1
  5. package/dist/src/lib/cloudflare/services/firewall/main.js +1 -1
  6. package/dist/src/lib/cloudflare/services/page/main.js +1 -1
  7. package/dist/src/lib/cloudflare/services/record/main.js +1 -1
  8. package/dist/src/lib/cloudflare/services/rule-set/main.js +1 -3
  9. package/dist/src/lib/cloudflare/services/worker/main.js +2 -6
  10. package/dist/src/lib/cloudflare/services/zone/main.js +1 -3
  11. package/package.json +1 -1
  12. package/src/lib/cloudflare/services/access/main.ts +8 -8
  13. package/src/lib/cloudflare/services/api-shield/main.ts +5 -5
  14. package/src/lib/cloudflare/services/argo/main.ts +2 -2
  15. package/src/lib/cloudflare/services/filter/main.ts +1 -1
  16. package/src/lib/cloudflare/services/firewall/main.ts +1 -1
  17. package/src/lib/cloudflare/services/page/main.ts +1 -1
  18. package/src/lib/cloudflare/services/record/main.ts +1 -1
  19. package/src/lib/cloudflare/services/rule-set/main.ts +1 -3
  20. package/src/lib/cloudflare/services/worker/main.ts +2 -6
  21. package/src/lib/cloudflare/services/zone/main.ts +2 -3
package/dist/src/lib/cloudflare/services/access/main.js CHANGED
@@ -43,7 +43,7 @@ class CloudflareAccessManager {
43
43
  throw `Props undefined for ${id}`;
44
44
  const zoneId = props.zoneId
45
45
  ? props.zoneId
46
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
46
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
47
47
  const accessApplication = new zero_trust_access_application_1.ZeroTrustAccessApplication(scope, `${id}`, {
48
48
  ...props,
49
49
  domain: `${props.domain}-${scope.props.domainName}`,
@@ -66,7 +66,7 @@ class CloudflareAccessManager {
66
66
  throw `Props undefined for ${id}`;
67
67
  const zoneId = props.zoneId
68
68
  ? props.zoneId
69
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
69
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
70
70
  const accessShortLivedCertificate = new zero_trust_access_short_lived_certificate_1.ZeroTrustAccessShortLivedCertificate(scope, `${id}`, {
71
71
  ...props,
72
72
  zoneId,
@@ -106,7 +106,7 @@ class CloudflareAccessManager {
106
106
  throw `Props undefined for ${id}`;
107
107
  const zoneId = props.zoneId
108
108
  ? props.zoneId
109
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
109
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
110
110
  const accessGroup = new zero_trust_access_group_1.ZeroTrustAccessGroup(scope, `${id}`, {
111
111
  ...props,
112
112
  name: `${props.name}-${scope.props.stage}`,
@@ -128,7 +128,7 @@ class CloudflareAccessManager {
128
128
  throw `Props undefined for ${id}`;
129
129
  const zoneId = props.zoneId
130
130
  ? props.zoneId
131
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
131
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
132
132
  const accessIdentityProvider = new zero_trust_access_identity_provider_1.ZeroTrustAccessIdentityProvider(scope, `${id}`, {
133
133
  ...props,
134
134
  name: `${props.name}-${scope.props.stage}`,
@@ -150,7 +150,7 @@ class CloudflareAccessManager {
150
150
  throw `Props undefined for ${id}`;
151
151
  const zoneId = props.zoneId
152
152
  ? props.zoneId
153
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
153
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
154
154
  const accessMutualTlsCertificate = new zero_trust_access_mtls_certificate_1.ZeroTrustAccessMtlsCertificate(scope, `${id}`, {
155
155
  ...props,
156
156
  name: `${props.name}-${scope.props.stage}`,
@@ -172,7 +172,7 @@ class CloudflareAccessManager {
172
172
  throw `Props undefined for ${id}`;
173
173
  const zoneId = props.zoneId
174
174
  ? props.zoneId
175
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
175
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
176
176
  const accessOrganization = new zero_trust_organization_1.ZeroTrustOrganization(scope, `${id}`, {
177
177
  ...props,
178
178
  name: `${props.name}-${scope.props.stage}`,
@@ -212,7 +212,7 @@ class CloudflareAccessManager {
212
212
  throw `Props undefined for ${id}`;
213
213
  const zoneId = props.zoneId
214
214
  ? props.zoneId
215
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
215
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
216
216
  const accessRule = new access_rule_1.AccessRule(scope, `${id}`, {
217
217
  ...props,
218
218
  zoneId,
@@ -234,7 +234,7 @@ class CloudflareAccessManager {
234
234
  throw `Props undefined for ${id}`;
235
235
  const zoneId = props.zoneId
236
236
  ? props.zoneId
237
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
237
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
238
238
  const accessServiceToken = new zero_trust_access_service_token_1.ZeroTrustAccessServiceToken(scope, `${id}`, {
239
239
  ...props,
240
240
  name: `${props.name}-${scope.props.stage}`,
package/dist/src/lib/cloudflare/services/api-shield/main.js CHANGED
@@ -37,7 +37,7 @@ class CloudflareApiShieldManager {
37
37
  throw `Props undefined for ${id}`;
38
38
  const zoneId = props.zoneId
39
39
  ? props.zoneId
40
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
40
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
41
41
  const apiShield = new api_shield_1.ApiShield(scope, `${id}`, {
42
42
  ...props,
43
43
  zoneId,
@@ -58,7 +58,7 @@ class CloudflareApiShieldManager {
58
58
  throw `Props undefined for ${id}`;
59
59
  const zoneId = props.zoneId
60
60
  ? props.zoneId
61
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
61
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
62
62
  const apiShieldSchema = new api_shield_schema_1.ApiShieldSchema(scope, `${id}`, {
63
63
  ...props,
64
64
  name: `${props.name}-${scope.props.stage}`,
@@ -80,7 +80,7 @@ class CloudflareApiShieldManager {
80
80
  throw `Props undefined for ${id}`;
81
81
  const zoneId = props.zoneId
82
82
  ? props.zoneId
83
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
83
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
84
84
  const apiShieldSchemaValidationSettings = new api_shield_schema_validation_settings_1.ApiShieldSchemaValidationSettings(scope, `${id}`, {
85
85
  ...props,
86
86
  zoneId,
@@ -101,7 +101,7 @@ class CloudflareApiShieldManager {
101
101
  throw `Props undefined for ${id}`;
102
102
  const zoneId = props.zoneId
103
103
  ? props.zoneId
104
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
104
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
105
105
  const apiShieldOperation = new api_shield_operation_1.ApiShieldOperation(scope, `${id}`, {
106
106
  ...props,
107
107
  zoneId,
@@ -122,7 +122,7 @@ class CloudflareApiShieldManager {
122
122
  throw `Props undefined for ${id}`;
123
123
  const zoneId = props.zoneId
124
124
  ? props.zoneId
125
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
125
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
126
126
  const apiShieldOperationSchemaValidationSettings = new api_shield_operation_schema_validation_settings_1.ApiShieldOperationSchemaValidationSettings(scope, `${id}`, {
127
127
  ...props,
128
128
  zoneId,
package/dist/src/lib/cloudflare/services/argo/main.js CHANGED
@@ -34,7 +34,7 @@ class CloudflareArgoManager {
34
34
  throw `Props undefined for ${id}`;
35
35
  const zoneId = props.zoneId
36
36
  ? props.zoneId
37
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
37
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
38
38
  const argoSmartRouting = new argo_smart_routing_1.ArgoSmartRouting(scope, `${id}`, {
39
39
  ...props,
40
40
  zoneId,
@@ -55,7 +55,7 @@ class CloudflareArgoManager {
55
55
  throw `Props undefined for ${id}`;
56
56
  const zoneId = props.zoneId
57
57
  ? props.zoneId
58
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
58
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
59
59
  const argoTieredCaching = new argo_tiered_caching_1.ArgoTieredCaching(scope, `${id}`, {
60
60
  ...props,
61
61
  zoneId,
package/dist/src/lib/cloudflare/services/filter/main.js CHANGED
@@ -33,7 +33,7 @@ class CloudflareFilterManager {
33
33
  throw `Props undefined for ${id}`;
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
37
37
  const filter = new filter_1.Filter(scope, `${id}`, {
38
38
  ...props,
39
39
  zoneId,
package/dist/src/lib/cloudflare/services/firewall/main.js CHANGED
@@ -33,7 +33,7 @@ class CloudflareFirewallManager {
33
33
  throw `Props undefined for ${id}`;
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
37
37
  const firewallRule = new firewall_rule_1.FirewallRule(scope, `${id}`, {
38
38
  ...props,
39
39
  zoneId,
package/dist/src/lib/cloudflare/services/page/main.js CHANGED
@@ -74,7 +74,7 @@ class CloudflarePageManager {
74
74
  throw `Props undefined for ${id}`;
75
75
  const zoneId = props.zoneId
76
76
  ? props.zoneId
77
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
77
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
78
78
  const pageRule = new page_rule_1.PageRule(scope, `${id}`, {
79
79
  ...props,
80
80
  zoneId,
package/dist/src/lib/cloudflare/services/record/main.js CHANGED
@@ -33,7 +33,7 @@ class CloudflareRecordManager {
33
33
  throw `Props undefined for ${id}`;
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id;
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
37
37
  const record = new dns_record_1.DnsRecord(scope, `${id}`, {
38
38
  ...props,
39
39
  zoneId,
package/dist/src/lib/cloudflare/services/rule-set/main.js CHANGED
@@ -33,9 +33,7 @@ class CloudflareRuleSetManager {
33
33
  throw `Props undefined for ${id}`;
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
37
- filter: { account: { name: scope.props.domainName } },
38
- })?.id;
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
39
37
  const ruleSet = new ruleset_1.Ruleset(scope, `${id}`, {
40
38
  ...props,
41
39
  zoneId,
package/dist/src/lib/cloudflare/services/worker/main.js CHANGED
@@ -38,9 +38,7 @@ class CloudflareWorkerManager {
38
38
  throw `Props undefined for ${id}`;
39
39
  const zoneId = props.zoneId
40
40
  ? props.zoneId
41
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
42
- filter: { account: { name: scope.props.domainName } },
43
- })?.id;
41
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
44
42
  const workerDomain = new workers_custom_domain_1.WorkersCustomDomain(scope, `${id}`, {
45
43
  ...props,
46
44
  accountId: props.accountId ?? scope.props.accountId,
@@ -62,9 +60,7 @@ class CloudflareWorkerManager {
62
60
  throw `Props undefined for ${id}`;
63
61
  const zoneId = props.zoneId
64
62
  ? props.zoneId
65
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
66
- filter: { account: { name: scope.props.domainName } },
67
- })?.id;
63
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId;
68
64
  const workerRoute = new workers_route_1.WorkersRoute(scope, `${id}`, {
69
65
  ...props,
70
66
  script: `${props.script}-${scope.props.stage}`,
package/dist/src/lib/cloudflare/services/zone/main.js CHANGED
@@ -54,9 +54,7 @@ class CloudflareZoneManager {
54
54
  resolveZone(id, scope, options) {
55
55
  const zone = new data_cloudflare_zone_1.DataCloudflareZone(scope, `${id}-data-zone`, {
56
56
  filter: {
57
- account: {
58
- name: options?.name ?? scope.props.domainName,
59
- },
57
+ name: options?.name ?? scope.props.domainName,
60
58
  },
61
59
  zoneId: options?.zoneId,
62
60
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gradientedge/cdk-utils",
3
- "version": "9.53.0",
3
+ "version": "9.53.2",
4
4
  "description": "Utilities for AWS CDK provisioning",
5
5
  "main": "dist/index.js",
6
6
  "engines": {
package/src/lib/cloudflare/services/access/main.ts CHANGED
@@ -55,7 +55,7 @@ export class CloudflareAccessManager {
55
55
 
56
56
  const zoneId = props.zoneId
57
57
  ? props.zoneId
58
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
58
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
59
59
 
60
60
  const accessApplication = new ZeroTrustAccessApplication(scope, `${id}`, {
61
61
  ...props,
@@ -86,7 +86,7 @@ export class CloudflareAccessManager {
86
86
 
87
87
  const zoneId = props.zoneId
88
88
  ? props.zoneId
89
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
89
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
90
90
 
91
91
  const accessShortLivedCertificate = new ZeroTrustAccessShortLivedCertificate(scope, `${id}`, {
92
92
  ...props,
@@ -137,7 +137,7 @@ export class CloudflareAccessManager {
137
137
 
138
138
  const zoneId = props.zoneId
139
139
  ? props.zoneId
140
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
140
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
141
141
 
142
142
  const accessGroup = new ZeroTrustAccessGroup(scope, `${id}`, {
143
143
  ...props,
@@ -167,7 +167,7 @@ export class CloudflareAccessManager {
167
167
 
168
168
  const zoneId = props.zoneId
169
169
  ? props.zoneId
170
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
170
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
171
171
 
172
172
  const accessIdentityProvider = new ZeroTrustAccessIdentityProvider(scope, `${id}`, {
173
173
  ...props,
@@ -201,7 +201,7 @@ export class CloudflareAccessManager {
201
201
 
202
202
  const zoneId = props.zoneId
203
203
  ? props.zoneId
204
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
204
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
205
205
 
206
206
  const accessMutualTlsCertificate = new ZeroTrustAccessMtlsCertificate(scope, `${id}`, {
207
207
  ...props,
@@ -231,7 +231,7 @@ export class CloudflareAccessManager {
231
231
 
232
232
  const zoneId = props.zoneId
233
233
  ? props.zoneId
234
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
234
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
235
235
 
236
236
  const accessOrganization = new ZeroTrustOrganization(scope, `${id}`, {
237
237
  ...props,
@@ -278,7 +278,7 @@ export class CloudflareAccessManager {
278
278
 
279
279
  const zoneId = props.zoneId
280
280
  ? props.zoneId
281
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
281
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
282
282
 
283
283
  const accessRule = new AccessRule(scope, `${id}`, {
284
284
  ...props,
@@ -308,7 +308,7 @@ export class CloudflareAccessManager {
308
308
 
309
309
  const zoneId = props.zoneId
310
310
  ? props.zoneId
311
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
311
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
312
312
 
313
313
  const accessServiceToken = new ZeroTrustAccessServiceToken(scope, `${id}`, {
314
314
  ...props,
package/src/lib/cloudflare/services/api-shield/main.ts CHANGED
@@ -43,7 +43,7 @@ export class CloudflareApiShieldManager {
43
43
 
44
44
  const zoneId = props.zoneId
45
45
  ? props.zoneId
46
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
46
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
47
47
 
48
48
  const apiShield = new ApiShield(scope, `${id}`, {
49
49
  ...props,
@@ -68,7 +68,7 @@ export class CloudflareApiShieldManager {
68
68
 
69
69
  const zoneId = props.zoneId
70
70
  ? props.zoneId
71
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
71
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
72
72
 
73
73
  const apiShieldSchema = new ApiShieldSchema(scope, `${id}`, {
74
74
  ...props,
@@ -98,7 +98,7 @@ export class CloudflareApiShieldManager {
98
98
 
99
99
  const zoneId = props.zoneId
100
100
  ? props.zoneId
101
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
101
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
102
102
 
103
103
  const apiShieldSchemaValidationSettings = new ApiShieldSchemaValidationSettings(scope, `${id}`, {
104
104
  ...props,
@@ -127,7 +127,7 @@ export class CloudflareApiShieldManager {
127
127
 
128
128
  const zoneId = props.zoneId
129
129
  ? props.zoneId
130
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
130
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
131
131
 
132
132
  const apiShieldOperation = new ApiShieldOperation(scope, `${id}`, {
133
133
  ...props,
@@ -156,7 +156,7 @@ export class CloudflareApiShieldManager {
156
156
 
157
157
  const zoneId = props.zoneId
158
158
  ? props.zoneId
159
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
159
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
160
160
 
161
161
  const apiShieldOperationSchemaValidationSettings = new ApiShieldOperationSchemaValidationSettings(scope, `${id}`, {
162
162
  ...props,
package/src/lib/cloudflare/services/argo/main.ts CHANGED
@@ -35,7 +35,7 @@ export class CloudflareArgoManager {
35
35
 
36
36
  const zoneId = props.zoneId
37
37
  ? props.zoneId
38
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
38
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
39
39
 
40
40
  const argoSmartRouting = new ArgoSmartRouting(scope, `${id}`, {
41
41
  ...props,
@@ -60,7 +60,7 @@ export class CloudflareArgoManager {
60
60
 
61
61
  const zoneId = props.zoneId
62
62
  ? props.zoneId
63
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
63
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
64
64
 
65
65
  const argoTieredCaching = new ArgoTieredCaching(scope, `${id}`, {
66
66
  ...props,
package/src/lib/cloudflare/services/filter/main.ts CHANGED
@@ -33,7 +33,7 @@ export class CloudflareFilterManager {
33
33
 
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
37
37
 
38
38
  const filter = new Filter(scope, `${id}`, {
39
39
  ...props,
package/src/lib/cloudflare/services/firewall/main.ts CHANGED
@@ -33,7 +33,7 @@ export class CloudflareFirewallManager {
33
33
 
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
37
37
 
38
38
  const firewallRule = new FirewallRule(scope, `${id}`, {
39
39
  ...props,
package/src/lib/cloudflare/services/page/main.ts CHANGED
@@ -80,7 +80,7 @@ export class CloudflarePageManager {
80
80
 
81
81
  const zoneId = props.zoneId
82
82
  ? props.zoneId
83
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
83
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
84
84
 
85
85
  const pageRule = new PageRule(scope, `${id}`, {
86
86
  ...props,
package/src/lib/cloudflare/services/record/main.ts CHANGED
@@ -33,7 +33,7 @@ export class CloudflareRecordManager {
33
33
 
34
34
  const zoneId = props.zoneId
35
35
  ? props.zoneId
36
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
36
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
37
37
 
38
38
  const record = new DnsRecord(scope, `${id}`, {
39
39
  ...props,
package/src/lib/cloudflare/services/rule-set/main.ts CHANGED
@@ -34,9 +34,7 @@ export class CloudflareRuleSetManager {
34
34
 
35
35
  const zoneId = props.zoneId
36
36
  ? props.zoneId
37
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
38
- filter: { account: { name: scope.props.domainName } },
39
- })?.id
37
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
40
38
 
41
39
  const ruleSet = new Ruleset(scope, `${id}`, {
42
40
  ...props,
package/src/lib/cloudflare/services/worker/main.ts CHANGED
@@ -45,9 +45,7 @@ export class CloudflareWorkerManager {
45
45
 
46
46
  const zoneId = props.zoneId
47
47
  ? props.zoneId
48
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
49
- filter: { account: { name: scope.props.domainName } },
50
- })?.id
48
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
51
49
 
52
50
  const workerDomain = new WorkersCustomDomain(scope, `${id}`, {
53
51
  ...props,
@@ -73,9 +71,7 @@ export class CloudflareWorkerManager {
73
71
 
74
72
  const zoneId = props.zoneId
75
73
  ? props.zoneId
76
- : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, {
77
- filter: { account: { name: scope.props.domainName } },
78
- })?.id
74
+ : scope.zoneManager.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.zoneId
79
75
 
80
76
  const workerRoute = new WorkersRoute(scope, `${id}`, {
81
77
  ...props,
package/src/lib/cloudflare/services/zone/main.ts CHANGED
@@ -66,9 +66,7 @@ export class CloudflareZoneManager {
66
66
  public resolveZone(id: string, scope: CommonCloudflareConstruct, options?: ZoneOptions) {
67
67
  const zone = new DataCloudflareZone(scope, `${id}-data-zone`, {
68
68
  filter: {
69
- account: {
70
- name: options?.name ?? scope.props.domainName,
71
- },
69
+ name: options?.name ?? scope.props.domainName,
72
70
  },
73
71
  zoneId: options?.zoneId,
74
72
  })
@@ -89,6 +87,7 @@ export class CloudflareZoneManager {
89
87
  const zoneId = props.zoneId
90
88
  ? props.zoneId
91
89
  : this.resolveZone(`${id}-data-zone`, scope, { name: scope.props.domainName })?.id
90
+
92
91
  const zoneCacheReserve = new ZoneCacheReserve(scope, `${id}`, {
93
92
  ...props,
94
93
  zoneId,