Merge pull request #149 from modular-magician/codegen-pr-1627

Autogen global forwarding rule

docs/resources/google_compute_global_forwarding_rule.md

@@ -28,29 +28,21 @@ Properties that can be accessed from the `google_compute_global_forwarding_rule`
 
   * `id`: The unique identifier for the resource.
 
-  * `ip_address`: The IP address that this forwarding rule is serving on behalf of.  Addresses are restricted based on the forwarding rule's load balancing scheme (EXTERNAL or INTERNAL) and scope (global or regional).  When the load balancing scheme is EXTERNAL, for global forwarding rules, the address must be a global IP, and for regional forwarding rules, the address must live in the same region as the forwarding rule. If this field is empty, an ephemeral IPv4 address from the same scope (global or regional) will be assigned. A regional forwarding rule supports IPv4 only. A global forwarding rule supports either IPv4 or IPv6.  When the load balancing scheme is INTERNAL, this can only be an RFC 1918 IP address belonging to the network/subnet configured for the forwarding rule. By default, if this field is empty, an ephemeral internal IP address will be automatically allocated from the IP range of the subnet or network configured for this forwarding rule.  An address can be specified either by a literal IP address or a URL reference to an existing Address resource. The following examples are all valid:  * 100.1.2.3 * https://www.googleapis.com/compute/v1/projects/project/regions/      region/addresses/address * projects/project/regions/region/addresses/address * regions/region/addresses/address * global/addresses/address * address
+  * `ip_address`: The IP address that this forwarding rule is serving on behalf of.  Addresses are restricted based on the forwarding rule's load balancing scheme (external or internal) and scope (global or regional). The address must be a global IP for external global forwarding rules.  If this field is empty, an ephemeral IPv4 address from the same scope (global) is closen. Global forwarding rules supports either IPv4 or IPv6.  When the load balancing scheme is INTERNAL_SELF_MANAGED, this must be a URL reference to an existing Address resource (internal regional static IP address), with a purpose of GCE_END_POINT and addressType of INTERNAL.  An address can be specified either by a literal IP address or a URL reference to an existing Address resource. The following examples are all valid:  * 100.1.2.3 * https://www.googleapis.com/compute/v1/projects/project/regions/      region/addresses/address * projects/project/regions/region/addresses/address * regions/region/addresses/address * global/addresses/address * address
 
-  * `ip_protocol`: The IP protocol to which this rule applies. Valid options are TCP, UDP, ESP, AH, SCTP or ICMP.  When the load balancing scheme is INTERNAL, only TCP and UDP are valid.
+  * `ip_protocol`: The IP protocol to which this rule applies. Valid options are TCP, UDP, ESP, AH, SCTP or ICMP. When the load balancing scheme is INTERNAL_SELF_MANAGED, only TCP is valid.
 
-  * `backend_service`: A reference to a BackendService to receive the matched traffic.  This is used for internal load balancing. (not used for external load balancing)
+  * `ip_version`: The IP Version that will be used by this global forwarding rule. Valid options are IPV4 or IPV6.
 
-  * `ip_version`: The IP Version that will be used by this forwarding rule. Valid options are IPV4 or IPV6. This can only be specified for a global forwarding rule.
-
-  * `load_balancing_scheme`: This signifies what the ForwardingRule will be used for and can only take the following values: INTERNAL, EXTERNAL The value of INTERNAL means that this will be used for Internal Network Load Balancing (TCP, UDP). The value of EXTERNAL means that this will be used for External Load Balancing (HTTP(S) LB, External TCP/UDP LB, SSL Proxy)
+  * `load_balancing_scheme`: This signifies what the GlobalForwardingRule will be used for. The value of INTERNAL_SELF_MANAGED means that this will be used for Internal Global HTTP(S) LB. The value of EXTERNAL means that this will be used for External Global Load Balancing (HTTP(S) LB, External TCP/UDP LB, SSL Proxy)  NOTE: Currently global forwarding rules cannot be used for INTERNAL load balancing.
 
   * `name`: Name of the resource; provided by the client when the resource is created. The name must be 1-63 characters long, and comply with RFC1035. Specifically, the name must be 1-63 characters long and match the regular expression `[a-z]([-a-z0-9]*[a-z0-9])?` which means the first character must be a lowercase letter, and all following characters must be a dash, lowercase letter, or digit, except the last character, which cannot be a dash.
 
-  * `network`: For internal load balancing, this field identifies the network that the load balanced IP should belong to for this Forwarding Rule. If this field is not specified, the default network will be used.  This field is not used for external load balancing.
+  * `network`: This field is not used for external load balancing. For INTERNAL_SELF_MANAGED load balancing, this field identifies the network that the load balanced IP should belong to for this global forwarding rule. If this field is not specified, the default network will be used.
 
   * `port_range`: This field is used along with the target field for TargetHttpProxy, TargetHttpsProxy, TargetSslProxy, TargetTcpProxy, TargetVpnGateway, TargetPool, TargetInstance.  Applicable only when IPProtocol is TCP, UDP, or SCTP, only packets addressed to ports in the specified range will be forwarded to target. Forwarding rules with the same [IPAddress, IPProtocol] pair must have disjoint port ranges.  Some types of forwarding target have constraints on the acceptable ports:  * TargetHttpProxy: 80, 8080 * TargetHttpsProxy: 443 * TargetTcpProxy: 25, 43, 110, 143, 195, 443, 465, 587, 700, 993, 995,                   1883, 5222 * TargetSslProxy: 25, 43, 110, 143, 195, 443, 465, 587, 700, 993, 995,                   1883, 5222 * TargetVpnGateway: 500, 4500
 
-  * `ports`: This field is used along with the backend_service field for internal load balancing.  When the load balancing scheme is INTERNAL, a single port or a comma separated list of ports can be configured. Only packets addressed to these ports will be forwarded to the backends configured with this forwarding rule.  You may specify a maximum of up to 5 ports.
-
-  * `subnetwork`: A reference to a subnetwork.  For internal load balancing, this field identifies the subnetwork that the load balanced IP should belong to for this Forwarding Rule.  If the network specified is in auto subnet mode, this field is optional. However, if the network is in custom subnet mode, a subnetwork must be specified.  This field is not used for external load balancing.
-
-  * `region`: A reference to the region where the regional forwarding rule resides. This field is not applicable to global forwarding rules.
-
-  * `target`: This target must be a global load balancing resource. The forwarded traffic must be of a type appropriate to the target object.  Valid types: HTTP_PROXY, HTTPS_PROXY, SSL_PROXY, TCP_PROXY
+  * `target`: The URL of the target resource to receive the matched traffic. The forwarded traffic must be of a type appropriate to the target object.
 
 
 

docs/resources/google_compute_global_forwarding_rules.md

@@ -23,15 +23,11 @@ See [google_compute_global_forwarding_rule.md](google_compute_global_forwarding_
   * `ids`: an array of `google_compute_global_forwarding_rule` id
   * `ip_addresses`: an array of `google_compute_global_forwarding_rule` ip_address
   * `ip_protocols`: an array of `google_compute_global_forwarding_rule` ip_protocol
-  * `backend_services`: an array of `google_compute_global_forwarding_rule` backend_service
   * `ip_versions`: an array of `google_compute_global_forwarding_rule` ip_version
   * `load_balancing_schemes`: an array of `google_compute_global_forwarding_rule` load_balancing_scheme
   * `names`: an array of `google_compute_global_forwarding_rule` name
   * `networks`: an array of `google_compute_global_forwarding_rule` network
   * `port_ranges`: an array of `google_compute_global_forwarding_rule` port_range
-  * `ports`: an array of `google_compute_global_forwarding_rule` ports
-  * `subnetworks`: an array of `google_compute_global_forwarding_rule` subnetwork
-  * `regions`: an array of `google_compute_global_forwarding_rule` region
   * `targets`: an array of `google_compute_global_forwarding_rule` target
 
 ## Filter Criteria

libraries/google_compute_global_forwarding_rule.rb

@@ -27,15 +27,11 @@ class GlobalForwardingRule < GcpResourceBase
   attr_reader :id
   attr_reader :ip_address
   attr_reader :ip_protocol
-  attr_reader :backend_service
   attr_reader :ip_version
   attr_reader :load_balancing_scheme
   attr_reader :name
   attr_reader :network
   attr_reader :port_range
-  attr_reader :ports
-  attr_reader :subnetwork
-  attr_reader :region
   attr_reader :target
 
   def initialize(params)
@@ -51,15 +47,11 @@ def parse
     @id = @fetched['id']
     @ip_address = @fetched['IPAddress']
     @ip_protocol = @fetched['IPProtocol']
-    @backend_service = @fetched['backendService']
     @ip_version = @fetched['ipVersion']
     @load_balancing_scheme = @fetched['loadBalancingScheme']
     @name = @fetched['name']
     @network = @fetched['network']
     @port_range = @fetched['portRange']
-    @ports = @fetched['ports']
-    @subnetwork = @fetched['subnetwork']
-    @region = @fetched['region']
     @target = @fetched['target']
   end
 

libraries/google_compute_global_forwarding_rules.rb

@@ -28,15 +28,11 @@ class GlobalForwardingRules < GcpResourceBase
   filter_table_config.add(:ids, field: :id)
   filter_table_config.add(:ip_addresses, field: :ip_address)
   filter_table_config.add(:ip_protocols, field: :ip_protocol)
-  filter_table_config.add(:backend_services, field: :backend_service)
   filter_table_config.add(:ip_versions, field: :ip_version)
   filter_table_config.add(:load_balancing_schemes, field: :load_balancing_scheme)
   filter_table_config.add(:names, field: :name)
   filter_table_config.add(:networks, field: :network)
   filter_table_config.add(:port_ranges, field: :port_range)
-  filter_table_config.add(:ports, field: :ports)
-  filter_table_config.add(:subnetworks, field: :subnetwork)
-  filter_table_config.add(:regions, field: :region)
   filter_table_config.add(:targets, field: :target)
 
   filter_table_config.connect(self, :table)
@@ -82,15 +78,11 @@ def transformers
       'id' => ->(obj) { return :id, obj['id'] },
       'IPAddress' => ->(obj) { return :ip_address, obj['IPAddress'] },
       'IPProtocol' => ->(obj) { return :ip_protocol, obj['IPProtocol'] },
-      'backendService' => ->(obj) { return :backend_service, obj['backendService'] },
       'ipVersion' => ->(obj) { return :ip_version, obj['ipVersion'] },
       'loadBalancingScheme' => ->(obj) { return :load_balancing_scheme, obj['loadBalancingScheme'] },
       'name' => ->(obj) { return :name, obj['name'] },
       'network' => ->(obj) { return :network, obj['network'] },
       'portRange' => ->(obj) { return :port_range, obj['portRange'] },
-      'ports' => ->(obj) { return :ports, obj['ports'] },
-      'subnetwork' => ->(obj) { return :subnetwork, obj['subnetwork'] },
-      'region' => ->(obj) { return :region, obj['region'] },
       'target' => ->(obj) { return :target, obj['target'] },
     }
   end