@pulumi/cloudflare 5.50.0-alpha.1744436206 → 6.0.0-alpha.1744627049

package/tunnel.d.ts

@@ -1,27 +1,28 @@
 import * as pulumi from "@pulumi/pulumi";
+import * as inputs from "./types/input";
+import * as outputs from "./types/output";
 /**
- * Tunnel exposes applications running on your local web server on any
- * network with an internet connection without manually adding DNS
- * records or configuring a firewall or router.
- *
  * ## Example Usage
  *
  * ```typescript
  * import * as pulumi from "@pulumi/pulumi";
  * import * as cloudflare from "@pulumi/cloudflare";
  *
- * const example = new cloudflare.Tunnel("example", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     name: "my-tunnel",
- *     secret: "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+ * const exampleZeroTrustTunnelCloudflared = new cloudflare.ZeroTrustTunnelCloudflared("example_zero_trust_tunnel_cloudflared", {
+ *     accountId: "699d98642c564d2e855e9661899b7252",
+ *     name: "blog",
+ *     configSrc: "local",
+ *     tunnelSecret: "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
  * });
  * ```
  *
  * ## Import
  *
  * ```sh
- * $ pulumi import cloudflare:index/tunnel:Tunnel example <account_id>/<tunnel_id>
+ * $ pulumi import cloudflare:index/tunnel:Tunnel example '<account_id>/<tunnel_id>'
  * ```
+ *
+ * @deprecated cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared
  */
 export declare class Tunnel extends pulumi.CustomResource {
     /**
@@ -40,29 +41,64 @@ export declare class Tunnel extends pulumi.CustomResource {
      */
     static isInstance(obj: any): obj is Tunnel;
     /**
-     * The account identifier to target for the resource. **Modifying this attribute will force creation of a new resource.**
+     * Cloudflare account ID
      */
     readonly accountId: pulumi.Output<string>;
     /**
-     * Usable CNAME for accessing the Tunnel.
+     * Cloudflare account ID
      */
-    readonly cname: pulumi.Output<string>;
+    readonly accountTag: pulumi.Output<string>;
     /**
-     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard or using tunnel*config, tunnel*route or tunnel*virtual*network resources. Available values: `local`, `cloudflare`. **Modifying this attribute will force creation of a new resource.**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
      */
-    readonly configSrc: pulumi.Output<string | undefined>;
+    readonly configSrc: pulumi.Output<string>;
     /**
-     * A user-friendly name chosen when the tunnel is created. **Modifying this attribute will force creation of a new resource.**
+     * The Cloudflare Tunnel connections between your origin and Cloudflare's edge.
+     */
+    readonly connections: pulumi.Output<outputs.TunnelConnection[]>;
+    /**
+     * Timestamp of when the tunnel established at least one connection to Cloudflare's edge. If `null`, the tunnel is inactive.
+     */
+    readonly connsActiveAt: pulumi.Output<string>;
+    /**
+     * Timestamp of when the tunnel became inactive (no connections to Cloudflare's edge). If `null`, the tunnel is active.
+     */
+    readonly connsInactiveAt: pulumi.Output<string>;
+    /**
+     * Timestamp of when the resource was created.
+     */
+    readonly createdAt: pulumi.Output<string>;
+    /**
+     * Timestamp of when the resource was deleted. If `null`, the resource has not been deleted.
+     */
+    readonly deletedAt: pulumi.Output<string>;
+    /**
+     * Metadata associated with the tunnel.
+     */
+    readonly metadata: pulumi.Output<string>;
+    /**
+     * A user-friendly name for a tunnel.
      */
     readonly name: pulumi.Output<string>;
     /**
-     * 32 or more bytes, encoded as a base64 string. The Create Argo Tunnel endpoint sets this as the tunnel's password. Anyone wishing to run the tunnel needs this password. **Modifying this attribute will force creation of a new resource.**
+     * If `true`, the tunnel can be configured remotely from the Zero Trust dashboard. If `false`, the tunnel must be configured locally on the origin machine.
+     */
+    readonly remoteConfig: pulumi.Output<boolean>;
+    /**
+     * The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+     * Available values: "inactive", "degraded", "healthy", "down".
+     */
+    readonly status: pulumi.Output<string>;
+    /**
+     * The type of tunnel.
+     * Available values: "cfd*tunnel", "warp*connector", "warp", "magic", "ipSec", "gre", "cni".
      */
-    readonly secret: pulumi.Output<string>;
+    readonly tunType: pulumi.Output<string>;
     /**
-     * Token used by a connector to authenticate and run the tunnel.
+     * Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.
      */
-    readonly tunnelToken: pulumi.Output<string>;
+    readonly tunnelSecret: pulumi.Output<string | undefined>;
     /**
      * Create a Tunnel resource with the given unique name, arguments, and options.
      *
@@ -70,6 +106,7 @@ export declare class Tunnel extends pulumi.CustomResource {
      * @param args The arguments to use to populate this resource's properties.
      * @param opts A bag of options that control this resource's behavior.
      */
+    /** @deprecated cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared */
     constructor(name: string, args: TunnelArgs, opts?: pulumi.CustomResourceOptions);
 }
 /**
@@ -77,48 +114,84 @@ export declare class Tunnel extends pulumi.CustomResource {
  */
 export interface TunnelState {
     /**
-     * The account identifier to target for the resource. **Modifying this attribute will force creation of a new resource.**
+     * Cloudflare account ID
      */
     accountId?: pulumi.Input<string>;
     /**
-     * Usable CNAME for accessing the Tunnel.
+     * Cloudflare account ID
      */
-    cname?: pulumi.Input<string>;
+    accountTag?: pulumi.Input<string>;
     /**
-     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard or using tunnel*config, tunnel*route or tunnel*virtual*network resources. Available values: `local`, `cloudflare`. **Modifying this attribute will force creation of a new resource.**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
      */
     configSrc?: pulumi.Input<string>;
     /**
-     * A user-friendly name chosen when the tunnel is created. **Modifying this attribute will force creation of a new resource.**
+     * The Cloudflare Tunnel connections between your origin and Cloudflare's edge.
+     */
+    connections?: pulumi.Input<pulumi.Input<inputs.TunnelConnection>[]>;
+    /**
+     * Timestamp of when the tunnel established at least one connection to Cloudflare's edge. If `null`, the tunnel is inactive.
+     */
+    connsActiveAt?: pulumi.Input<string>;
+    /**
+     * Timestamp of when the tunnel became inactive (no connections to Cloudflare's edge). If `null`, the tunnel is active.
+     */
+    connsInactiveAt?: pulumi.Input<string>;
+    /**
+     * Timestamp of when the resource was created.
+     */
+    createdAt?: pulumi.Input<string>;
+    /**
+     * Timestamp of when the resource was deleted. If `null`, the resource has not been deleted.
+     */
+    deletedAt?: pulumi.Input<string>;
+    /**
+     * Metadata associated with the tunnel.
+     */
+    metadata?: pulumi.Input<string>;
+    /**
+     * A user-friendly name for a tunnel.
      */
     name?: pulumi.Input<string>;
     /**
-     * 32 or more bytes, encoded as a base64 string. The Create Argo Tunnel endpoint sets this as the tunnel's password. Anyone wishing to run the tunnel needs this password. **Modifying this attribute will force creation of a new resource.**
+     * If `true`, the tunnel can be configured remotely from the Zero Trust dashboard. If `false`, the tunnel must be configured locally on the origin machine.
+     */
+    remoteConfig?: pulumi.Input<boolean>;
+    /**
+     * The status of the tunnel. Valid values are `inactive` (tunnel has never been run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy state), `healthy` (tunnel is active and able to serve traffic), or `down` (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+     * Available values: "inactive", "degraded", "healthy", "down".
+     */
+    status?: pulumi.Input<string>;
+    /**
+     * The type of tunnel.
+     * Available values: "cfd*tunnel", "warp*connector", "warp", "magic", "ipSec", "gre", "cni".
      */
-    secret?: pulumi.Input<string>;
+    tunType?: pulumi.Input<string>;
     /**
-     * Token used by a connector to authenticate and run the tunnel.
+     * Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.
      */
-    tunnelToken?: pulumi.Input<string>;
+    tunnelSecret?: pulumi.Input<string>;
 }
 /**
  * The set of arguments for constructing a Tunnel resource.
  */
 export interface TunnelArgs {
     /**
-     * The account identifier to target for the resource. **Modifying this attribute will force creation of a new resource.**
+     * Cloudflare account ID
      */
     accountId: pulumi.Input<string>;
     /**
-     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard or using tunnel*config, tunnel*route or tunnel*virtual*network resources. Available values: `local`, `cloudflare`. **Modifying this attribute will force creation of a new resource.**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
      */
     configSrc?: pulumi.Input<string>;
     /**
-     * A user-friendly name chosen when the tunnel is created. **Modifying this attribute will force creation of a new resource.**
+     * A user-friendly name for a tunnel.
      */
     name: pulumi.Input<string>;
     /**
-     * 32 or more bytes, encoded as a base64 string. The Create Argo Tunnel endpoint sets this as the tunnel's password. Anyone wishing to run the tunnel needs this password. **Modifying this attribute will force creation of a new resource.**
+     * Sets the password required to run a locally-managed tunnel. Must be at least 32 bytes and encoded as a base64 string.
      */
-    secret: pulumi.Input<string>;
+    tunnelSecret?: pulumi.Input<string>;
 }

package/tunnel.js

@@ -6,28 +6,27 @@ exports.Tunnel = void 0;
 const pulumi = require("@pulumi/pulumi");
 const utilities = require("./utilities");
 /**
- * Tunnel exposes applications running on your local web server on any
- * network with an internet connection without manually adding DNS
- * records or configuring a firewall or router.
- *
  * ## Example Usage
  *
  * ```typescript
  * import * as pulumi from "@pulumi/pulumi";
  * import * as cloudflare from "@pulumi/cloudflare";
  *
- * const example = new cloudflare.Tunnel("example", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     name: "my-tunnel",
- *     secret: "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
+ * const exampleZeroTrustTunnelCloudflared = new cloudflare.ZeroTrustTunnelCloudflared("example_zero_trust_tunnel_cloudflared", {
+ *     accountId: "699d98642c564d2e855e9661899b7252",
+ *     name: "blog",
+ *     configSrc: "local",
+ *     tunnelSecret: "AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=",
  * });
  * ```
  *
  * ## Import
  *
  * ```sh
- * $ pulumi import cloudflare:index/tunnel:Tunnel example <account_id>/<tunnel_id>
+ * $ pulumi import cloudflare:index/tunnel:Tunnel example '<account_id>/<tunnel_id>'
  * ```
+ *
+ * @deprecated cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared
  */
 class Tunnel extends pulumi.CustomResource {
     /**
@@ -40,6 +39,7 @@ class Tunnel extends pulumi.CustomResource {
      * @param opts Optional settings to control the behavior of the CustomResource.
      */
     static get(name, id, state, opts) {
+        pulumi.log.warn("Tunnel is deprecated: cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared");
         return new Tunnel(name, state, Object.assign(Object.assign({}, opts), { id: id }));
     }
     /**
@@ -52,17 +52,27 @@ class Tunnel extends pulumi.CustomResource {
         }
         return obj['__pulumiType'] === Tunnel.__pulumiType;
     }
+    /** @deprecated cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared */
     constructor(name, argsOrState, opts) {
+        pulumi.log.warn("Tunnel is deprecated: cloudflare.index/tunnel.Tunnel has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflared.ZeroTrustTunnelCloudflared");
         let resourceInputs = {};
         opts = opts || {};
         if (opts.id) {
             const state = argsOrState;
             resourceInputs["accountId"] = state ? state.accountId : undefined;
-            resourceInputs["cname"] = state ? state.cname : undefined;
+            resourceInputs["accountTag"] = state ? state.accountTag : undefined;
             resourceInputs["configSrc"] = state ? state.configSrc : undefined;
+            resourceInputs["connections"] = state ? state.connections : undefined;
+            resourceInputs["connsActiveAt"] = state ? state.connsActiveAt : undefined;
+            resourceInputs["connsInactiveAt"] = state ? state.connsInactiveAt : undefined;
+            resourceInputs["createdAt"] = state ? state.createdAt : undefined;
+            resourceInputs["deletedAt"] = state ? state.deletedAt : undefined;
+            resourceInputs["metadata"] = state ? state.metadata : undefined;
             resourceInputs["name"] = state ? state.name : undefined;
-            resourceInputs["secret"] = state ? state.secret : undefined;
-            resourceInputs["tunnelToken"] = state ? state.tunnelToken : undefined;
+            resourceInputs["remoteConfig"] = state ? state.remoteConfig : undefined;
+            resourceInputs["status"] = state ? state.status : undefined;
+            resourceInputs["tunType"] = state ? state.tunType : undefined;
+            resourceInputs["tunnelSecret"] = state ? state.tunnelSecret : undefined;
         }
         else {
             const args = argsOrState;
@@ -72,18 +82,25 @@ class Tunnel extends pulumi.CustomResource {
             if ((!args || args.name === undefined) && !opts.urn) {
                 throw new Error("Missing required property 'name'");
             }
-            if ((!args || args.secret === undefined) && !opts.urn) {
-                throw new Error("Missing required property 'secret'");
-            }
             resourceInputs["accountId"] = args ? args.accountId : undefined;
             resourceInputs["configSrc"] = args ? args.configSrc : undefined;
             resourceInputs["name"] = args ? args.name : undefined;
-            resourceInputs["secret"] = (args === null || args === void 0 ? void 0 : args.secret) ? pulumi.secret(args.secret) : undefined;
-            resourceInputs["cname"] = undefined /*out*/;
-            resourceInputs["tunnelToken"] = undefined /*out*/;
+            resourceInputs["tunnelSecret"] = (args === null || args === void 0 ? void 0 : args.tunnelSecret) ? pulumi.secret(args.tunnelSecret) : undefined;
+            resourceInputs["accountTag"] = undefined /*out*/;
+            resourceInputs["connections"] = undefined /*out*/;
+            resourceInputs["connsActiveAt"] = undefined /*out*/;
+            resourceInputs["connsInactiveAt"] = undefined /*out*/;
+            resourceInputs["createdAt"] = undefined /*out*/;
+            resourceInputs["deletedAt"] = undefined /*out*/;
+            resourceInputs["metadata"] = undefined /*out*/;
+            resourceInputs["remoteConfig"] = undefined /*out*/;
+            resourceInputs["status"] = undefined /*out*/;
+            resourceInputs["tunType"] = undefined /*out*/;
         }
         opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
-        const secretOpts = { additionalSecretOutputs: ["secret", "tunnelToken"] };
+        const aliasOpts = { aliases: [{ type: "cloudflare:index/tunnel:Tunnel" }] };
+        opts = pulumi.mergeOptions(opts, aliasOpts);
+        const secretOpts = { additionalSecretOutputs: ["tunnelSecret"] };
         opts = pulumi.mergeOptions(opts, secretOpts);
         super(Tunnel.__pulumiType, name, resourceInputs, opts);
     }

package/tunnel.js.map

@@ -1 +1 @@
-{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../tunnel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tunnel.js","sourceRoot":"","sources":["../tunnel.ts"],"names":[],"mappings":";AAAA,wFAAwF;AACxF,iFAAiF;;;AAEjF,yCAAyC;AAGzC,yCAAyC;AAEzC;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,MAAO,SAAQ,MAAM,CAAC,cAAc;IAC7C;;;;;;;;OAQG;IACI,MAAM,CAAC,GAAG,CAAC,IAAY,EAAE,EAA2B,EAAE,KAAmB,EAAE,IAAmC;QACjH,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,6JAA6J,CAAC,CAAA;QAC9K,OAAO,IAAI,MAAM,CAAC,IAAI,EAAO,KAAK,kCAAO,IAAI,KAAE,EAAE,EAAE,EAAE,IAAG,CAAC;IAC7D,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,MAAM,CAAC,YAAY,CAAC;IACvD,CAAC;IAuED,wJAAwJ;IACxJ,YAAY,IAAY,EAAE,WAAsC,EAAE,IAAmC;QACjG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,6JAA6J,CAAC,CAAA;QAC9K,IAAI,cAAc,GAAkB,EAAE,CAAC;QACvC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QAClB,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,MAAM,KAAK,GAAG,WAAsC,CAAC;YACrD,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,YAAY,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACtE,cAAc,CAAC,eAAe,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1E,cAAc,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9E,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAClE,cAAc,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,cAAc,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACxD,cAAc,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,cAAc,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,cAAc,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9D,cAAc,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;SAC3E;aAAM;YACH,MAAM,IAAI,GAAG,WAAqC,CAAC;YACnD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACtD,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;aAC5D;YACD,IAAI,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;gBACjD,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;aACvD;YACD,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,cAAc,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAChE,cAAc,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YACtD,cAAc,CAAC,cAAc,CAAC,GAAG,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,EAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnG,cAAc,CAAC,YAAY,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YACjD,cAAc,CAAC,aAAa,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YAClD,cAAc,CAAC,eAAe,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YACpD,cAAc,CAAC,iBAAiB,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YACtD,cAAc,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YAChD,cAAc,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YAChD,cAAc,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YAC/C,cAAc,CAAC,cAAc,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YACnD,cAAc,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;YAC7C,cAAc,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC;SACjD;QACD,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,oBAAoB,EAAE,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,gCAAgC,EAAE,CAAC,EAAE,CAAC;QAC5E,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,EAAE,uBAAuB,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;QACjE,IAAI,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC7C,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;;AApJL,wBAqJC;AAtIG,gBAAgB;AACO,mBAAY,GAAG,gCAAgC,CAAC"}

package/tunnelConfig.d.ts

@@ -2,78 +2,15 @@ import * as pulumi from "@pulumi/pulumi";
 import * as inputs from "./types/input";
 import * as outputs from "./types/output";
 /**
- * Provides a Cloudflare Tunnel configuration resource.
- *
  * ## Example Usage
  *
- * ```typescript
- * import * as pulumi from "@pulumi/pulumi";
- * import * as cloudflare from "@pulumi/cloudflare";
- *
- * const exampleTunnel = new cloudflare.ZeroTrustTunnelCloudflared("example_tunnel", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     name: "example_tunnel",
- *     secret: "<32 character secret>",
- * });
- * const exampleConfig = new cloudflare.TunnelConfig("example_config", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     tunnelId: exampleTunnel.id,
- *     config: {
- *         warpRouting: {
- *             enabled: true,
- *         },
- *         originRequest: {
- *             connectTimeout: "1m0s",
- *             tlsTimeout: "1m0s",
- *             tcpKeepAlive: "1m0s",
- *             noHappyEyeballs: false,
- *             keepAliveConnections: 1024,
- *             keepAliveTimeout: "1m0s",
- *             httpHostHeader: "baz",
- *             originServerName: "foobar",
- *             caPool: "/path/to/unsigned/ca/pool",
- *             noTlsVerify: false,
- *             disableChunkedEncoding: false,
- *             bastionMode: false,
- *             proxyAddress: "10.0.0.1",
- *             proxyPort: 8123,
- *             proxyType: "socks",
- *             ipRules: [{
- *                 prefix: "/web",
- *                 ports: [
- *                     80,
- *                     443,
- *                 ],
- *                 allow: false,
- *             }],
- *         },
- *         ingressRules: [
- *             {
- *                 hostname: "foo",
- *                 path: "/bar",
- *                 service: "http://10.0.0.2:8080",
- *                 originRequest: {
- *                     connectTimeout: "2m0s",
- *                     access: {
- *                         required: true,
- *                         teamName: "terraform",
- *                         audTags: ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"],
- *                     },
- *                 },
- *             },
- *             {
- *                 service: "https://10.0.0.3:8081",
- *             },
- *         ],
- *     },
- * });
- * ```
- *
  * ## Import
  *
  * ```sh
- * $ pulumi import cloudflare:index/tunnelConfig:TunnelConfig example <account_id>/<tunnel_id>
+ * $ pulumi import cloudflare:index/tunnelConfig:TunnelConfig example '<account_id>/<tunnel_id>'
  * ```
+ *
+ * @deprecated cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig
  */
 export declare class TunnelConfig extends pulumi.CustomResource {
     /**
@@ -92,17 +29,27 @@ export declare class TunnelConfig extends pulumi.CustomResource {
      */
     static isInstance(obj: any): obj is TunnelConfig;
     /**
-     * The account identifier to target for the resource.
+     * Identifier
      */
     readonly accountId: pulumi.Output<string>;
     /**
-     * Configuration block for Tunnel Configuration.
+     * The tunnel configuration and ingress rules.
      */
     readonly config: pulumi.Output<outputs.TunnelConfigConfig>;
+    readonly createdAt: pulumi.Output<string>;
+    /**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel's configuration on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
+     */
+    readonly source: pulumi.Output<string>;
     /**
-     * Identifier of the Tunnel to target for this configuration.
+     * UUID of the tunnel.
      */
     readonly tunnelId: pulumi.Output<string>;
+    /**
+     * The version of the Tunnel Configuration.
+     */
+    readonly version: pulumi.Output<number>;
     /**
      * Create a TunnelConfig resource with the given unique name, arguments, and options.
      *
@@ -110,6 +57,7 @@ export declare class TunnelConfig extends pulumi.CustomResource {
      * @param args The arguments to use to populate this resource's properties.
      * @param opts A bag of options that control this resource's behavior.
      */
+    /** @deprecated cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig */
     constructor(name: string, args: TunnelConfigArgs, opts?: pulumi.CustomResourceOptions);
 }
 /**
@@ -117,32 +65,47 @@ export declare class TunnelConfig extends pulumi.CustomResource {
  */
 export interface TunnelConfigState {
     /**
-     * The account identifier to target for the resource.
+     * Identifier
      */
     accountId?: pulumi.Input<string>;
     /**
-     * Configuration block for Tunnel Configuration.
+     * The tunnel configuration and ingress rules.
      */
     config?: pulumi.Input<inputs.TunnelConfigConfig>;
+    createdAt?: pulumi.Input<string>;
+    /**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel's configuration on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
+     */
+    source?: pulumi.Input<string>;
     /**
-     * Identifier of the Tunnel to target for this configuration.
+     * UUID of the tunnel.
      */
     tunnelId?: pulumi.Input<string>;
+    /**
+     * The version of the Tunnel Configuration.
+     */
+    version?: pulumi.Input<number>;
 }
 /**
  * The set of arguments for constructing a TunnelConfig resource.
  */
 export interface TunnelConfigArgs {
     /**
-     * The account identifier to target for the resource.
+     * Identifier
      */
     accountId: pulumi.Input<string>;
     /**
-     * Configuration block for Tunnel Configuration.
+     * The tunnel configuration and ingress rules.
+     */
+    config?: pulumi.Input<inputs.TunnelConfigConfig>;
+    /**
+     * Indicates if this is a locally or remotely configured tunnel. If `local`, manage the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the tunnel's configuration on the Zero Trust dashboard.
+     * Available values: "local", "cloudflare".
      */
-    config: pulumi.Input<inputs.TunnelConfigConfig>;
+    source?: pulumi.Input<string>;
     /**
-     * Identifier of the Tunnel to target for this configuration.
+     * UUID of the tunnel.
      */
     tunnelId: pulumi.Input<string>;
 }

package/tunnelConfig.js

@@ -6,78 +6,15 @@ exports.TunnelConfig = void 0;
 const pulumi = require("@pulumi/pulumi");
 const utilities = require("./utilities");
 /**
- * Provides a Cloudflare Tunnel configuration resource.
- *
  * ## Example Usage
  *
- * ```typescript
- * import * as pulumi from "@pulumi/pulumi";
- * import * as cloudflare from "@pulumi/cloudflare";
- *
- * const exampleTunnel = new cloudflare.ZeroTrustTunnelCloudflared("example_tunnel", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     name: "example_tunnel",
- *     secret: "<32 character secret>",
- * });
- * const exampleConfig = new cloudflare.TunnelConfig("example_config", {
- *     accountId: "f037e56e89293a057740de681ac9abbe",
- *     tunnelId: exampleTunnel.id,
- *     config: {
- *         warpRouting: {
- *             enabled: true,
- *         },
- *         originRequest: {
- *             connectTimeout: "1m0s",
- *             tlsTimeout: "1m0s",
- *             tcpKeepAlive: "1m0s",
- *             noHappyEyeballs: false,
- *             keepAliveConnections: 1024,
- *             keepAliveTimeout: "1m0s",
- *             httpHostHeader: "baz",
- *             originServerName: "foobar",
- *             caPool: "/path/to/unsigned/ca/pool",
- *             noTlsVerify: false,
- *             disableChunkedEncoding: false,
- *             bastionMode: false,
- *             proxyAddress: "10.0.0.1",
- *             proxyPort: 8123,
- *             proxyType: "socks",
- *             ipRules: [{
- *                 prefix: "/web",
- *                 ports: [
- *                     80,
- *                     443,
- *                 ],
- *                 allow: false,
- *             }],
- *         },
- *         ingressRules: [
- *             {
- *                 hostname: "foo",
- *                 path: "/bar",
- *                 service: "http://10.0.0.2:8080",
- *                 originRequest: {
- *                     connectTimeout: "2m0s",
- *                     access: {
- *                         required: true,
- *                         teamName: "terraform",
- *                         audTags: ["AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"],
- *                     },
- *                 },
- *             },
- *             {
- *                 service: "https://10.0.0.3:8081",
- *             },
- *         ],
- *     },
- * });
- * ```
- *
  * ## Import
  *
  * ```sh
- * $ pulumi import cloudflare:index/tunnelConfig:TunnelConfig example <account_id>/<tunnel_id>
+ * $ pulumi import cloudflare:index/tunnelConfig:TunnelConfig example '<account_id>/<tunnel_id>'
  * ```
+ *
+ * @deprecated cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig
  */
 class TunnelConfig extends pulumi.CustomResource {
     /**
@@ -90,6 +27,7 @@ class TunnelConfig extends pulumi.CustomResource {
      * @param opts Optional settings to control the behavior of the CustomResource.
      */
     static get(name, id, state, opts) {
+        pulumi.log.warn("TunnelConfig is deprecated: cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig");
         return new TunnelConfig(name, state, Object.assign(Object.assign({}, opts), { id: id }));
     }
     /**
@@ -102,31 +40,38 @@ class TunnelConfig extends pulumi.CustomResource {
         }
         return obj['__pulumiType'] === TunnelConfig.__pulumiType;
     }
+    /** @deprecated cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig */
     constructor(name, argsOrState, opts) {
+        pulumi.log.warn("TunnelConfig is deprecated: cloudflare.index/tunnelconfig.TunnelConfig has been deprecated in favor of cloudflare.index/zerotrusttunnelcloudflaredconfig.ZeroTrustTunnelCloudflaredConfig");
         let resourceInputs = {};
         opts = opts || {};
         if (opts.id) {
             const state = argsOrState;
             resourceInputs["accountId"] = state ? state.accountId : undefined;
             resourceInputs["config"] = state ? state.config : undefined;
+            resourceInputs["createdAt"] = state ? state.createdAt : undefined;
+            resourceInputs["source"] = state ? state.source : undefined;
             resourceInputs["tunnelId"] = state ? state.tunnelId : undefined;
+            resourceInputs["version"] = state ? state.version : undefined;
         }
         else {
             const args = argsOrState;
             if ((!args || args.accountId === undefined) && !opts.urn) {
                 throw new Error("Missing required property 'accountId'");
             }
-            if ((!args || args.config === undefined) && !opts.urn) {
-                throw new Error("Missing required property 'config'");
-            }
             if ((!args || args.tunnelId === undefined) && !opts.urn) {
                 throw new Error("Missing required property 'tunnelId'");
             }
             resourceInputs["accountId"] = args ? args.accountId : undefined;
             resourceInputs["config"] = args ? args.config : undefined;
+            resourceInputs["source"] = args ? args.source : undefined;
             resourceInputs["tunnelId"] = args ? args.tunnelId : undefined;
+            resourceInputs["createdAt"] = undefined /*out*/;
+            resourceInputs["version"] = undefined /*out*/;
         }
         opts = pulumi.mergeOptions(utilities.resourceOptsDefaults(), opts);
+        const aliasOpts = { aliases: [{ type: "cloudflare:index/tunnelConfig:TunnelConfig" }] };
+        opts = pulumi.mergeOptions(opts, aliasOpts);
         super(TunnelConfig.__pulumiType, name, resourceInputs, opts);
     }
 }