@pulumi/cloudflare 4.2.0 → 4.3.0-alpha.1642545043

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 (12) hide show
  1. package/firewallRule.d.ts +3 -3
  2. package/loadBalancerMonitor.d.ts +6 -6
  3. package/logPushOwnershipChallenge.d.ts +27 -5
  4. package/logPushOwnershipChallenge.js +12 -3
  5. package/logPushOwnershipChallenge.js.map +1 -1
  6. package/logpushJob.d.ts +44 -11
  7. package/logpushJob.js +17 -3
  8. package/logpushJob.js.map +1 -1
  9. package/package.json +2 -2
  10. package/package.json.dev +1 -1
  11. package/types/input.d.ts +2 -0
  12. package/types/output.d.ts +2 -0
package/firewallRule.d.ts CHANGED
@@ -54,7 +54,7 @@ export declare class FirewallRule extends pulumi.CustomResource {
54
54
  */
55
55
  static isInstance(obj: any): obj is FirewallRule;
56
56
  /**
57
- * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "bypass". Enterprise plan also allows "log".
57
+ * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "managedChallenge", "bypass". Enterprise plan also allows "log".
58
58
  */
59
59
  readonly action: pulumi.Output<string>;
60
60
  /**
@@ -92,7 +92,7 @@ export declare class FirewallRule extends pulumi.CustomResource {
92
92
  */
93
93
  export interface FirewallRuleState {
94
94
  /**
95
- * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "bypass". Enterprise plan also allows "log".
95
+ * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "managedChallenge", "bypass". Enterprise plan also allows "log".
96
96
  */
97
97
  action?: pulumi.Input<string>;
98
98
  /**
@@ -122,7 +122,7 @@ export interface FirewallRuleState {
122
122
  */
123
123
  export interface FirewallRuleArgs {
124
124
  /**
125
- * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "bypass". Enterprise plan also allows "log".
125
+ * The action to apply to a matched request. Allowed values: "block", "challenge", "allow", "jsChallenge", "managedChallenge", "bypass". Enterprise plan also allows "log".
126
126
  */
127
127
  action: pulumi.Input<string>;
128
128
  /**
package/loadBalancerMonitor.d.ts CHANGED
@@ -95,7 +95,7 @@ export declare class LoadBalancerMonitor extends pulumi.CustomResource {
95
95
  */
96
96
  readonly interval: pulumi.Output<number | undefined>;
97
97
  /**
98
- * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", or "connectionEstablished" if `type` is "tcp" .
98
+ * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", "connectionEstablished" if `type` is "tcp", and empty otherwise.
99
99
  */
100
100
  readonly method: pulumi.Output<string>;
101
101
  /**
@@ -123,7 +123,7 @@ export declare class LoadBalancerMonitor extends pulumi.CustomResource {
123
123
  */
124
124
  readonly timeout: pulumi.Output<number | undefined>;
125
125
  /**
126
- * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'. Default: "http".
126
+ * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS', 'TCP', 'UDP-ICMP', 'ICMP-PING', and 'SMTP'. Default: "http".
127
127
  */
128
128
  readonly type: pulumi.Output<string | undefined>;
129
129
  /**
@@ -172,7 +172,7 @@ export interface LoadBalancerMonitorState {
172
172
  */
173
173
  interval?: pulumi.Input<number>;
174
174
  /**
175
- * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", or "connectionEstablished" if `type` is "tcp" .
175
+ * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", "connectionEstablished" if `type` is "tcp", and empty otherwise.
176
176
  */
177
177
  method?: pulumi.Input<string>;
178
178
  /**
@@ -200,7 +200,7 @@ export interface LoadBalancerMonitorState {
200
200
  */
201
201
  timeout?: pulumi.Input<number>;
202
202
  /**
203
- * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'. Default: "http".
203
+ * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS', 'TCP', 'UDP-ICMP', 'ICMP-PING', and 'SMTP'. Default: "http".
204
204
  */
205
205
  type?: pulumi.Input<string>;
206
206
  }
@@ -237,7 +237,7 @@ export interface LoadBalancerMonitorArgs {
237
237
  */
238
238
  interval?: pulumi.Input<number>;
239
239
  /**
240
- * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", or "connectionEstablished" if `type` is "tcp" .
240
+ * The method to use for the health check. Valid values are any valid HTTP verb if `type` is "http" or "https", or `connectionEstablished` if `type` is "tcp". Default: "GET" if `type` is "http" or "https", "connectionEstablished" if `type` is "tcp", and empty otherwise.
241
241
  */
242
242
  method?: pulumi.Input<string>;
243
243
  /**
@@ -261,7 +261,7 @@ export interface LoadBalancerMonitorArgs {
261
261
  */
262
262
  timeout?: pulumi.Input<number>;
263
263
  /**
264
- * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS' and 'TCP'. Default: "http".
264
+ * The protocol to use for the healthcheck. Currently supported protocols are 'HTTP', 'HTTPS', 'TCP', 'UDP-ICMP', 'ICMP-PING', and 'SMTP'. Default: "http".
265
265
  */
266
266
  type?: pulumi.Input<string>;
267
267
  }
package/logPushOwnershipChallenge.d.ts CHANGED
@@ -15,6 +15,16 @@ import * as pulumi from "@pulumi/pulumi";
15
15
  * zoneId: "d41d8cd98f00b204e9800998ecf8427e",
16
16
  * });
17
17
  * ```
18
+ *
19
+ * ```typescript
20
+ * import * as pulumi from "@pulumi/pulumi";
21
+ * import * as cloudflare from "@pulumi/cloudflare";
22
+ *
23
+ * const example = new cloudflare.LogPushOwnershipChallenge("example", {
24
+ * accountId: "1d5fdc9e88c8a8c4518b068cd94331fe",
25
+ * destinationConf: "s3://my-bucket-path?region=us-west-2",
26
+ * });
27
+ * ```
18
28
  */
19
29
  export declare class LogPushOwnershipChallenge extends pulumi.CustomResource {
20
30
  /**
@@ -32,6 +42,10 @@ export declare class LogPushOwnershipChallenge extends pulumi.CustomResource {
32
42
  * when multiple copies of the Pulumi SDK have been loaded into the same process.
33
43
  */
34
44
  static isInstance(obj: any): obj is LogPushOwnershipChallenge;
45
+ /**
46
+ * The account ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
47
+ */
48
+ readonly accountId: pulumi.Output<string | undefined>;
35
49
  /**
36
50
  * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
37
51
  */
@@ -42,9 +56,9 @@ export declare class LogPushOwnershipChallenge extends pulumi.CustomResource {
42
56
  */
43
57
  readonly ownershipChallengeFilename: pulumi.Output<string>;
44
58
  /**
45
- * The zone ID where the logpush ownership challenge should be created.
59
+ * The zone ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
46
60
  */
47
- readonly zoneId: pulumi.Output<string>;
61
+ readonly zoneId: pulumi.Output<string | undefined>;
48
62
  /**
49
63
  * Create a LogPushOwnershipChallenge resource with the given unique name, arguments, and options.
50
64
  *
@@ -58,6 +72,10 @@ export declare class LogPushOwnershipChallenge extends pulumi.CustomResource {
58
72
  * Input properties used for looking up and filtering LogPushOwnershipChallenge resources.
59
73
  */
60
74
  export interface LogPushOwnershipChallengeState {
75
+ /**
76
+ * The account ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
77
+ */
78
+ accountId?: pulumi.Input<string>;
61
79
  /**
62
80
  * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
63
81
  */
@@ -68,7 +86,7 @@ export interface LogPushOwnershipChallengeState {
68
86
  */
69
87
  ownershipChallengeFilename?: pulumi.Input<string>;
70
88
  /**
71
- * The zone ID where the logpush ownership challenge should be created.
89
+ * The zone ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
72
90
  */
73
91
  zoneId?: pulumi.Input<string>;
74
92
  }
@@ -76,12 +94,16 @@ export interface LogPushOwnershipChallengeState {
76
94
  * The set of arguments for constructing a LogPushOwnershipChallenge resource.
77
95
  */
78
96
  export interface LogPushOwnershipChallengeArgs {
97
+ /**
98
+ * The account ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
99
+ */
100
+ accountId?: pulumi.Input<string>;
79
101
  /**
80
102
  * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
81
103
  */
82
104
  destinationConf: pulumi.Input<string>;
83
105
  /**
84
- * The zone ID where the logpush ownership challenge should be created.
106
+ * The zone ID where the logpush ownership challenge should be created. Either `accountId` or `zoneId` are required.
85
107
  */
86
- zoneId: pulumi.Input<string>;
108
+ zoneId?: pulumi.Input<string>;
87
109
  }
package/logPushOwnershipChallenge.js CHANGED
@@ -21,6 +21,16 @@ const utilities = require("./utilities");
21
21
  * zoneId: "d41d8cd98f00b204e9800998ecf8427e",
22
22
  * });
23
23
  * ```
24
+ *
25
+ * ```typescript
26
+ * import * as pulumi from "@pulumi/pulumi";
27
+ * import * as cloudflare from "@pulumi/cloudflare";
28
+ *
29
+ * const example = new cloudflare.LogPushOwnershipChallenge("example", {
30
+ * accountId: "1d5fdc9e88c8a8c4518b068cd94331fe",
31
+ * destinationConf: "s3://my-bucket-path?region=us-west-2",
32
+ * });
33
+ * ```
24
34
  */
25
35
  class LogPushOwnershipChallenge extends pulumi.CustomResource {
26
36
  constructor(name, argsOrState, opts) {
@@ -28,6 +38,7 @@ class LogPushOwnershipChallenge extends pulumi.CustomResource {
28
38
  opts = opts || {};
29
39
  if (opts.id) {
30
40
  const state = argsOrState;
41
+ inputs["accountId"] = state ? state.accountId : undefined;
31
42
  inputs["destinationConf"] = state ? state.destinationConf : undefined;
32
43
  inputs["ownershipChallengeFilename"] = state ? state.ownershipChallengeFilename : undefined;
33
44
  inputs["zoneId"] = state ? state.zoneId : undefined;
@@ -37,9 +48,7 @@ class LogPushOwnershipChallenge extends pulumi.CustomResource {
37
48
  if ((!args || args.destinationConf === undefined) && !opts.urn) {
38
49
  throw new Error("Missing required property 'destinationConf'");
39
50
  }
40
- if ((!args || args.zoneId === undefined) && !opts.urn) {
41
- throw new Error("Missing required property 'zoneId'");
42
- }
51
+ inputs["accountId"] = args ? args.accountId : undefined;
43
52
  inputs["destinationConf"] = args ? args.destinationConf : undefined;
44
53
  inputs["zoneId"] = args ? args.zoneId : undefined;
45
54
  inputs["ownershipChallengeFilename"] = undefined /*out*/;
package/logPushOwnershipChallenge.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logPushOwnershipChallenge.js","sourceRoot":"","sources":["../logPushOwnershipChallenge.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AACzC,yCAAyC;AAEzC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,yBAA0B,SAAQ,MAAM,CAAC,cAAc;IAkDhE,YAAY,IAAY,EAAE,WAA4E,EAAE,IAAmC;QACvI,IAAI,MAAM,GAAkB,EAAE,CAAC;QAC/B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,MAAM,KAAK,GAAG,WAAyD,CAAC;YACxE,MAAM,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,CAAC,4BAA4B,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;SACvD;aAAM;YACH,MAAM,IAAI,GAAG,WAAwD,CAAC;YACtE,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAClE;YACD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACnD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;aACzD;YACD,MAAM,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAClD,MAAM,CAAC,4BAA4B,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;SAC5D;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,EAAC,CAAC,CAAC;SACxE;QACD,KAAK,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IAzED;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAsC,EAAE,IAAmC;QACpI,OAAO,IAAI,yBAAyB,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAChF,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,yBAAyB,CAAC,YAAY,CAAC;IAC1E,CAAC;;AA1BL,8DA2EC;AA7DG,gBAAgB;AACO,sCAAY,GAAG,sEAAsE,CAAC"}
1
+ {"version":3,"file":"logPushOwnershipChallenge.js","sourceRoot":"","sources":["../logPushOwnershipChallenge.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AACzC,yCAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAa,yBAA0B,SAAQ,MAAM,CAAC,cAAc;IAsDhE,YAAY,IAAY,EAAE,WAA4E,EAAE,IAAmC;QACvI,IAAI,MAAM,GAAkB,EAAE,CAAC;QAC/B,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,MAAM,KAAK,GAAG,WAAyD,CAAC;YACxE,MAAM,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1D,MAAM,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,MAAM,CAAC,4BAA4B,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5F,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;SACvD;aAAM;YACH,MAAM,IAAI,GAAG,WAAwD,CAAC;YACtE,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,eAAe,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBAC5D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;aAClE;YACD,MAAM,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,MAAM,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAClD,MAAM,CAAC,4BAA4B,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;SAC5D;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,EAAC,CAAC,CAAC;SACxE;QACD,KAAK,CAAC,yBAAyB,CAAC,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IACtE,CAAC;IA5ED;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAsC,EAAE,IAAmC;QACpI,OAAO,IAAI,yBAAyB,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAChF,CAAC;IAKD;;;OAGG;IACI,MAAM,CAAC,UAAU,CAAC,GAAQ;QAC7B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE;YACnC,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,GAAG,CAAC,cAAc,CAAC,KAAK,yBAAyB,CAAC,YAAY,CAAC;IAC1E,CAAC;;AA1BL,8DA8EC;AAhEG,gBAAgB;AACO,sCAAY,GAAG,sEAAsE,CAAC"}
package/logpushJob.d.ts CHANGED
@@ -1,4 +1,19 @@
1
1
  import * as pulumi from "@pulumi/pulumi";
2
+ /**
3
+ * ## Import
4
+ *
5
+ * Logpush jobs can be imported using a composite ID formed of* `identifierType` - Either `account` or `zone`. * `identifierID` - The ID of the account or zone. * `jobID` - The Logpush Job ID to import. Import an account-scoped job using `account/:accountID/:jobID`
6
+ *
7
+ * ```sh
8
+ * $ pulumi import cloudflare:index/logpushJob:LogpushJob example account/1d5fdc9e88c8a8c4518b068cd94331fe/54321
9
+ * ```
10
+ *
11
+ * Import a zone-scoped job using `zone/:zoneID/:jobID`
12
+ *
13
+ * ```sh
14
+ * $ pulumi import cloudflare:index/logpushJob:LogpushJob example zone/d41d8cd98f00b204e9800998ecf8427e/54321
15
+ * ```
16
+ */
2
17
  export declare class LogpushJob extends pulumi.CustomResource {
3
18
  /**
4
19
  * Get an existing LogpushJob resource's state with the given name, ID, and optional extra
@@ -16,11 +31,17 @@ export declare class LogpushJob extends pulumi.CustomResource {
16
31
  */
17
32
  static isInstance(obj: any): obj is LogpushJob;
18
33
  /**
19
- * Which type of dataset resource to use. Available values are `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"` and `"nelReports"`.
34
+ * The account ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
35
+ */
36
+ readonly accountId: pulumi.Output<string | undefined>;
37
+ /**
38
+ * Which type of dataset resource to use. Available values are
39
+ * - [account-scoped](https://developers.cloudflare.com/logs/reference/log-fields/account): `"auditLogs"`, `"gatewayDns"`, `"gatewayHttp"`, `"gatewayNetwork"`
40
+ * - [zone-scoped](https://developers.cloudflare.com/logs/reference/log-fields/zone): `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"`, `"nelReports"`
20
41
  */
21
42
  readonly dataset: pulumi.Output<string>;
22
43
  /**
23
- * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
44
+ * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/reference/logpush-api-configuration#destination).
24
45
  */
25
46
  readonly destinationConf: pulumi.Output<string>;
26
47
  /**
@@ -41,9 +62,9 @@ export declare class LogpushJob extends pulumi.CustomResource {
41
62
  */
42
63
  readonly ownershipChallenge: pulumi.Output<string | undefined>;
43
64
  /**
44
- * The zone ID where the logpush job should be created.
65
+ * The zone ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
45
66
  */
46
- readonly zoneId: pulumi.Output<string>;
67
+ readonly zoneId: pulumi.Output<string | undefined>;
47
68
  /**
48
69
  * Create a LogpushJob resource with the given unique name, arguments, and options.
49
70
  *
@@ -58,11 +79,17 @@ export declare class LogpushJob extends pulumi.CustomResource {
58
79
  */
59
80
  export interface LogpushJobState {
60
81
  /**
61
- * Which type of dataset resource to use. Available values are `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"` and `"nelReports"`.
82
+ * The account ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
83
+ */
84
+ accountId?: pulumi.Input<string>;
85
+ /**
86
+ * Which type of dataset resource to use. Available values are
87
+ * - [account-scoped](https://developers.cloudflare.com/logs/reference/log-fields/account): `"auditLogs"`, `"gatewayDns"`, `"gatewayHttp"`, `"gatewayNetwork"`
88
+ * - [zone-scoped](https://developers.cloudflare.com/logs/reference/log-fields/zone): `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"`, `"nelReports"`
62
89
  */
63
90
  dataset?: pulumi.Input<string>;
64
91
  /**
65
- * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
92
+ * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/reference/logpush-api-configuration#destination).
66
93
  */
67
94
  destinationConf?: pulumi.Input<string>;
68
95
  /**
@@ -83,7 +110,7 @@ export interface LogpushJobState {
83
110
  */
84
111
  ownershipChallenge?: pulumi.Input<string>;
85
112
  /**
86
- * The zone ID where the logpush job should be created.
113
+ * The zone ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
87
114
  */
88
115
  zoneId?: pulumi.Input<string>;
89
116
  }
@@ -92,11 +119,17 @@ export interface LogpushJobState {
92
119
  */
93
120
  export interface LogpushJobArgs {
94
121
  /**
95
- * Which type of dataset resource to use. Available values are `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"` and `"nelReports"`.
122
+ * The account ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
123
+ */
124
+ accountId?: pulumi.Input<string>;
125
+ /**
126
+ * Which type of dataset resource to use. Available values are
127
+ * - [account-scoped](https://developers.cloudflare.com/logs/reference/log-fields/account): `"auditLogs"`, `"gatewayDns"`, `"gatewayHttp"`, `"gatewayNetwork"`
128
+ * - [zone-scoped](https://developers.cloudflare.com/logs/reference/log-fields/zone): `"firewallEvents"`, `"httpRequests"`, `"spectrumEvents"`, `"nelReports"`
96
129
  */
97
130
  dataset: pulumi.Input<string>;
98
131
  /**
99
- * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/logpush/logpush-configuration-api/understanding-logpush-api/#destination).
132
+ * Uniquely identifies a resource (such as an s3 bucket) where data will be pushed. Additional configuration parameters supported by the destination may be included. See [Logpush destination documentation](https://developers.cloudflare.com/logs/reference/logpush-api-configuration#destination).
100
133
  */
101
134
  destinationConf: pulumi.Input<string>;
102
135
  /**
@@ -117,7 +150,7 @@ export interface LogpushJobArgs {
117
150
  */
118
151
  ownershipChallenge?: pulumi.Input<string>;
119
152
  /**
120
- * The zone ID where the logpush job should be created.
153
+ * The zone ID where the logpush job should be created. Either `accountId` or `zoneId` are required.
121
154
  */
122
- zoneId: pulumi.Input<string>;
155
+ zoneId?: pulumi.Input<string>;
123
156
  }
package/logpushJob.js CHANGED
@@ -5,12 +5,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
5
5
  exports.LogpushJob = void 0;
6
6
  const pulumi = require("@pulumi/pulumi");
7
7
  const utilities = require("./utilities");
8
+ /**
9
+ * ## Import
10
+ *
11
+ * Logpush jobs can be imported using a composite ID formed of* `identifierType` - Either `account` or `zone`. * `identifierID` - The ID of the account or zone. * `jobID` - The Logpush Job ID to import. Import an account-scoped job using `account/:accountID/:jobID`
12
+ *
13
+ * ```sh
14
+ * $ pulumi import cloudflare:index/logpushJob:LogpushJob example account/1d5fdc9e88c8a8c4518b068cd94331fe/54321
15
+ * ```
16
+ *
17
+ * Import a zone-scoped job using `zone/:zoneID/:jobID`
18
+ *
19
+ * ```sh
20
+ * $ pulumi import cloudflare:index/logpushJob:LogpushJob example zone/d41d8cd98f00b204e9800998ecf8427e/54321
21
+ * ```
22
+ */
8
23
  class LogpushJob extends pulumi.CustomResource {
9
24
  constructor(name, argsOrState, opts) {
10
25
  let inputs = {};
11
26
  opts = opts || {};
12
27
  if (opts.id) {
13
28
  const state = argsOrState;
29
+ inputs["accountId"] = state ? state.accountId : undefined;
14
30
  inputs["dataset"] = state ? state.dataset : undefined;
15
31
  inputs["destinationConf"] = state ? state.destinationConf : undefined;
16
32
  inputs["enabled"] = state ? state.enabled : undefined;
@@ -27,9 +43,7 @@ class LogpushJob extends pulumi.CustomResource {
27
43
  if ((!args || args.destinationConf === undefined) && !opts.urn) {
28
44
  throw new Error("Missing required property 'destinationConf'");
29
45
  }
30
- if ((!args || args.zoneId === undefined) && !opts.urn) {
31
- throw new Error("Missing required property 'zoneId'");
32
- }
46
+ inputs["accountId"] = args ? args.accountId : undefined;
33
47
  inputs["dataset"] = args ? args.dataset : undefined;
34
48
  inputs["destinationConf"] = args ? args.destinationConf : undefined;
35
49
  inputs["enabled"] = args ? args.enabled : undefined;
package/logpushJob.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"logpushJob.js","sourceRoot":"","sources":["../logpushJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"logpushJob.js","sourceRoot":"","sources":["../logpushJob.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pulumi/cloudflare",
3
- "version": "v4.2.0",
3
+ "version": "v4.3.0-alpha.1642545043+5a83fb49",
4
4
  "description": "A Pulumi package for creating and managing Cloudflare cloud resources.",
5
5
  "keywords": [
6
6
  "pulumi",
@@ -11,7 +11,7 @@
11
11
  "license": "Apache-2.0",
12
12
  "scripts": {
13
13
  "build": "tsc",
14
- "install": "node scripts/install-pulumi-plugin.js resource cloudflare v4.2.0"
14
+ "install": "node scripts/install-pulumi-plugin.js resource cloudflare v4.3.0-alpha.1642545043+5a83fb49"
15
15
  },
16
16
  "dependencies": {
17
17
  "@pulumi/pulumi": "^3.0.0"
package/package.json.dev CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@pulumi/cloudflare",
3
- "version": "v4.2.0",
3
+ "version": "v4.3.0-alpha.1642545043+5a83fb49",
4
4
  "description": "A Pulumi package for creating and managing Cloudflare cloud resources.",
5
5
  "keywords": [
6
6
  "pulumi",
package/types/input.d.ts CHANGED
@@ -489,6 +489,8 @@ export interface CustomSslCustomSslPriority {
489
489
  priority?: pulumi.Input<number>;
490
490
  }
491
491
  export interface DevicePostureRuleInput {
492
+ complianceStatus?: pulumi.Input<string>;
493
+ connectionId?: pulumi.Input<string>;
492
494
  /**
493
495
  * = (Required) The domain that the client must join.
494
496
  */
package/types/output.d.ts CHANGED
@@ -488,6 +488,8 @@ export interface CustomSslCustomSslPriority {
488
488
  priority?: number;
489
489
  }
490
490
  export interface DevicePostureRuleInput {
491
+ complianceStatus?: string;
492
+ connectionId?: string;
491
493
  /**
492
494
  * = (Required) The domain that the client must join.
493
495
  */