diff --git a/patches/0009-Remove-pattern-string-from-compute-forwarding-rules.patch b/patches/0009-Remove-pattern-string-from-compute-forwarding-rules.patch deleted file mode 100644 index f9cf160a1c..0000000000 --- a/patches/0009-Remove-pattern-string-from-compute-forwarding-rules.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Guinevere Saenger -Date: Thu, 16 Nov 2023 13:58:59 -0800 -Subject: [PATCH] Remove pattern string from compute forwarding rules - - -diff --git a/website/docs/r/compute_forwarding_rule.html.markdown b/website/docs/r/compute_forwarding_rule.html.markdown -index 66a79fd0f..ac540c4ec 100644 ---- a/website/docs/r/compute_forwarding_rule.html.markdown -+++ b/website/docs/r/compute_forwarding_rule.html.markdown -@@ -1435,7 +1435,7 @@ The following arguments are supported: - For internal forwarding rules within the same VPC network, two or more - forwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and - cannot have overlapping `portRange`s. -- @pattern: \d+(?:-\d+)? -+ - - * `ports` - - (Optional) -@@ -1456,7 +1456,7 @@ The following arguments are supported: - For internal forwarding rules within the same VPC network, two or more - forwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if - they share at least one port number. -- @pattern: \d+(?:-\d+)? -+ - - * `subnetwork` - - (Optional) -diff --git a/website/docs/r/compute_global_forwarding_rule.html.markdown b/website/docs/r/compute_global_forwarding_rule.html.markdown -index dfb21c11f..07818c850 100644 ---- a/website/docs/r/compute_global_forwarding_rule.html.markdown -+++ b/website/docs/r/compute_global_forwarding_rule.html.markdown -@@ -1337,7 +1337,7 @@ The following arguments are supported: - For internal forwarding rules within the same VPC network, two or more - forwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and - cannot have overlapping `portRange`s. -- @pattern: \d+(?:-\d+)? -+ - - * `subnetwork` - - (Optional) diff --git a/patches/0010-fix-label-imports.patch b/patches/0009-fix-label-imports.patch similarity index 100% rename from patches/0010-fix-label-imports.patch rename to patches/0009-fix-label-imports.patch diff --git a/provider/cmd/pulumi-resource-gcp/schema.json b/provider/cmd/pulumi-resource-gcp/schema.json index 23f97aaf30..bfb531f9b9 100644 --- a/provider/cmd/pulumi-resource-gcp/schema.json +++ b/provider/cmd/pulumi-resource-gcp/schema.json @@ -146716,14 +146716,14 @@ }, "portRange": { "type": "string", - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n" + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n" }, "ports": { "type": "array", "items": { "type": "string" }, - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n" + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n@pattern: \\d+(?:-\\d+)?\n" }, "project": { "type": "string", @@ -146885,7 +146885,7 @@ }, "portRange": { "type": "string", - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n", + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "ports": { @@ -146893,7 +146893,7 @@ "items": { "type": "string" }, - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n", + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "project": { @@ -147041,7 +147041,7 @@ }, "portRange": { "type": "string", - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n", + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "ports": { @@ -147049,7 +147049,7 @@ "items": { "type": "string" }, - "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n", + "description": "The `ports`, `portRange`, and `allPorts` fields are mutually exclusive.\nOnly packets addressed to ports in the specified range will be forwarded\nto the backends configured with this forwarding rule.\nThe `ports` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: internal passthrough\nNetwork Load Balancers, backend service-based external passthrough Network\nLoad Balancers, and internal protocol forwarding.\n* You can specify a list of up to five ports by number, separated by\ncommas. The ports can be contiguous or discontiguous.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair if they share at least one port\nnumber.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair if\nthey share at least one port number.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "project": { @@ -147418,7 +147418,7 @@ }, "portRange": { "type": "string", - "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n" + "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n" }, "project": { "type": "string", @@ -147544,7 +147544,7 @@ }, "portRange": { "type": "string", - "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n", + "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "project": { @@ -147659,7 +147659,7 @@ }, "portRange": { "type": "string", - "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n", + "description": "The `portRange` field has the following limitations:\n* It requires that the forwarding rule `IPProtocol` be TCP, UDP, or SCTP,\nand\n* It's applicable only to the following products: external passthrough\nNetwork Load Balancers, internal and external proxy Network Load\nBalancers, internal and external Application Load Balancers, external\nprotocol forwarding, and Classic VPN.\n* Some products have restrictions on what ports can be used. See\n[port specifications](https://cloud.google.com/load-balancing/docs/forwarding-rule-concepts#port_specifications)\nfor details.\nFor external forwarding rules, two or more forwarding rules cannot use the\nsame `[IPAddress, IPProtocol]` pair, and cannot have overlapping\n`portRange`s.\nFor internal forwarding rules within the same VPC network, two or more\nforwarding rules cannot use the same `[IPAddress, IPProtocol]` pair, and\ncannot have overlapping `portRange`s.\n@pattern: \\d+(?:-\\d+)?\n", "willReplaceOnChanges": true }, "project": {