Merge branch 'master' into sql-settings-version

google/python_utils.rb

@@ -35,5 +35,17 @@ def python_literal(value)
         raise "Unsupported Python literal #{value}"
       end
     end
+
+    # Generates a method declaration with function name `name` and args `args`
+    # Arguments may have nils and will be ignored.
+    def method_decl(name, args)
+      "def #{name}(#{args.compact.join(', ')}):"
+    end
+
+    # Generates a method call to function name `name` and args `args`
+    # Arguments may have nils and will be ignored.
+    def method_call(name, args)
+      "#{name}(#{args.compact.join(', ')})"
+    end
   end
 end

google/ruby_utils.rb

@@ -33,5 +33,32 @@ def ruby_literal(value)
         raise "Unsupported Ruby literal #{value}"
       end
     end
+
+    def method_decl(name, args)
+      ["def #{name}", ("(#{args.compact.join(', ')})" unless args.empty?)].compact.join
+    end
+
+    # rubocop:disable Metrics/AbcSize
+    def method_call(name, args, indent = 0)
+      args = args.compact
+      format([
+               # All on one line.
+               [
+                 [name.to_s, ("(#{args.join(', ')})" unless args.empty?)].compact.join
+               ],
+               # All but first on one line.
+               [
+                 [name.to_s, ("(#{args[0..-1].join(', ')}" unless args.empty?)].compact.join,
+                 "#{indent(args.last, indent + name.length + 2)})"
+               ],
+               # All on separate lines.
+               [
+                 "#{name}(#{args.first},",
+                 indent_list(args.slice(1..-2), indent + name.length + 1, true),
+                 indent("#{args.last})", indent + name.length + 1)
+               ]
+             ], 0, indent)
+    end
+    # rubocop:enable Metrics/AbcSize
   end
 end

products/compute/ansible.yaml

@@ -116,6 +116,10 @@ overrides: !ruby/object:Provider::ResourceOverrides
         version_added: '2.7'
   BackendService: !ruby/object:Provider::Ansible::ResourceOverride
     properties:
+      loadBalancingScheme: !ruby/object:Provider::Ansible::PropertyOverride
+        version_added: '2.7'
+      iap: !ruby/object:Provider::Ansible::PropertyOverride
+        version_added: '2.7'
       timeoutSec: !ruby/object:Provider::Ansible::PropertyOverride
         aliases:
           - timeout_seconds
@@ -226,6 +230,21 @@ overrides: !ruby/object:Provider::ResourceOverrides
       timeoutSec: !ruby/object:Provider::Ansible::PropertyOverride
         aliases:
           - timeout_seconds
+  InstanceGroup: !ruby/object:Provider::Ansible::ResourceOverride
+    properties:
+      instances: !ruby/object:Provider::Ansible::PropertyOverride
+        version_added: '2.7'
+        exclude: false
+    update: |
+      instance = InstanceLogic(module)
+      instance.run()
+    post_action: |
+      if fetch:
+          instance = InstanceLogic(module)
+          instance.run()
+          fetch.update({'instances': instance.list_instances()})
+    provider_helpers:
+      - 'products/compute/helpers/python/instancegroup_instances.py'
   Instance: !ruby/object:Provider::Ansible::ResourceOverride
     provider_helpers:
       - 'products/compute/helpers/python/provider_instance.py'

products/compute/api.yaml

@@ -448,9 +448,32 @@ objects:
         name: 'id'
         description: 'The unique identifier for the resource.'
         output: true
-      # 'loadBalancingScheme' is undefined: string? enum? ref? http://b/63215956
-      # | - !ruby/object:Api::Type::???
-      # |   name: 'loadBalancingScheme'
+      - !ruby/object:Api::Type::NestedObject
+        name: 'iap'
+        description: Settings for enabling Cloud Identity Aware Proxy
+        properties:
+          - !ruby/object:Api::Type::Boolean
+            name: 'enabled'
+            description: Enables IAP.
+          - !ruby/object:Api::Type::String
+            name: 'oauth2ClientId'
+            description: OAuth2 Client ID for IAP
+          - !ruby/object:Api::Type::String
+            name: 'oauth2ClientSecret'
+            description: OAuth2 Client Secret for IAP
+          - !ruby/object:Api::Type::String
+            name: 'oauth2ClientSecretSha256'
+            description: OAuth2 Client Secret SHA-256 for IAP
+            output: true
+      - !ruby/object:Api::Type::Enum
+        name: 'loadBalancingScheme'
+        description: |
+          Indicates whether the backend service will be used with internal or
+          external load balancing. A backend service created for one type of
+          load balancing cannot be used with the other.
+        values:
+          - :INTERNAL
+          - :EXTERNAL
       - !ruby/object:Api::Type::String
         name: 'name'
         description: |
@@ -780,6 +803,14 @@ objects:
           is unspecified, the firewall rule will be enabled.
         min_version: beta
         send_empty_value: true
+      - !ruby/object:Api::Type::Boolean
+        name: 'enableLogging'
+        description: |
+          This field denotes whether to enable logging for a particular
+          firewall rule. If logging is enabled, logs will be exported to
+          Stackdriver.
+        min_version: beta
+        send_empty_value: true
       - !ruby/object:Api::Type::Integer
         name: 'id'
         description: 'The unique identifier for the resource.'
@@ -1258,10 +1289,25 @@ objects:
     name: 'HealthCheck'
     kind: 'compute#healthCheck'
     base_url: projects/{{project}}/global/healthChecks
-    description:
-      An HealthCheck resource. This resource defines a template for how
-      individual virtual machines should be checked for health, via one of the
-      supported protocols.
+    exports:
+      - !ruby/object:Api::Type::SelfLink
+        name: 'selfLink'
+    references: !ruby/object:Api::Resource::ReferenceLinks
+      guides:
+        'Official Documentation': 'https://cloud.google.com/load-balancing/docs/health-checks'
+      api: 'https://cloud.google.com/compute/docs/reference/rest/latest/healthChecks'
+    description: |
+      Health Checks determine whether instances are responsive and able to do work.
+      They are an important part of a comprehensive load balancing configuration,
+      as they enable monitoring instances behind load balancers.
+
+      Health Checks poll instances at a specified interval. Instances that
+      do not respond successfully to some number of probes in a row are marked
+      as unhealthy. No new connections are sent to unhealthy instances,
+      though existing connections will continue. The health check will
+      continue to poll unhealthy instances. If an instance later responds
+      successfully to some number of consecutive probes, it is marked
+      healthy again and can receive new connections.
 <%= indent(compile_file({}, 'templates/global_async.yaml.erb'), 4) %>
     properties:
       - !ruby/object:Api::Type::Integer
@@ -1284,6 +1330,7 @@ objects:
         description: |
           A so-far unhealthy instance will be marked healthy after this many
           consecutive successes. The default value is 2.
+        default_value: 2
       - !ruby/object:Api::Type::Integer
         name: 'id'
         description: |
@@ -1292,6 +1339,8 @@ objects:
         output: true
       - !ruby/object:Api::Type::String
         name: 'name'
+        required: true
+        input: true
         description: |
           Name of the resource. Provided by the client when the resource is
           created. The name must be 1-63 characters long, and comply with
@@ -1324,6 +1373,7 @@ objects:
           - :TCP
           - :SSL
           - :HTTP
+          - :HTTPS
       - !ruby/object:Api::Type::NestedObject
         name: 'httpHealthCheck'
         properties:
@@ -1816,6 +1866,20 @@ objects:
         imports: 'name'
         description: 'A reference to the zone where the instance group resides.'
         required: true
+      - !ruby/object:Api::Type::Array
+        name: 'instances'
+        description: |
+          The list of instances associated with this InstanceGroup.
+          All instances must be created before being added to an InstanceGroup.
+          All instances not in this list will be removed from the InstanceGroup
+          and will not be deleted.
+          Only the full identifier of the instance will be returned.
+        exclude: true
+        item_type: !ruby/object:Api::Type::ResourceRef
+          name: 'instance'
+          description: 'An instance being added to the InstanceGroup'
+          resource: 'Instance'
+          imports: 'selfLink'
     properties:
       - !ruby/object:Api::Type::Time
         name: 'creationTimestamp'

products/compute/healthcheck_protocol_props.yaml.erb

@@ -10,6 +10,7 @@
   description: |
     The request path of the <%= protocol -%> health check request.
     The default value is /.
+  default_value: "/"
 <% elsif ['SSL', 'TCP'].include?(protocol) -%>
 - !ruby/object:Api::Type::String
   name: 'request'
@@ -47,3 +48,4 @@
   values:
     - :NONE
     - :PROXY_V1
+  default_value: :NONE

products/compute/helpers/python/instancegroup_instances.py

@@ -0,0 +1,64 @@
+<%
+# Instance Logic handling for Instance Groups
+# This code handles the adding + removing of instances from an instance group.
+# It should be run after all normal create/update/delete logic.
+
+-%>
+class InstanceLogic(object):
+    def __init__(self, module):
+        self.module = module
+        self.current_instances = self.list_instances()
+        self.module_instances = []
+
+        # Transform module list of instances (dicts of instance responses) into a list of selfLinks.
+        instances = self.module.params.get('instances')
+        if instances:
+            for instance in instances:
+                self.module_instances.append(replace_resource_dict(instance, 'selfLink'))
+
+    def run(self):
+        # Find all instances to add and add them
+        instances_to_add = list(set(self.module_instances) - set(self.current_instances))
+        if instances_to_add:
+            self.add_instances(instances_to_add)
+
+        # Find all instances to remove and remove them
+        instances_to_remove = list(set(self.current_instances) - set(self.module_instances))
+        if instances_to_remove:
+            self.remove_instances(instances_to_remove)
+
+    def list_instances(self):
+        auth = GcpSession(self.module, 'compute')
+        response = return_if_object(self.module, auth.post(self._list_instances_url(), {'instanceState': 'ALL'}),
+                                    'compute#instanceGroupsListInstances')
+
+        # Transform instance list into a list of selfLinks for diffing with module parameters
+        instances = []
+        for instance in response.get('items', []):
+            instances.append(instance['instance'])
+        return instances
+
+    def add_instances(self, instances):
+        auth = GcpSession(self.module, 'compute')
+        wait_for_operation(self.module, auth.post(self._add_instances_url(), self._build_request(instances)))
+
+    def remove_instances(self, instances):
+        auth = GcpSession(self.module, 'compute')
+        wait_for_operation(self.module, auth.post(self._remove_instances_url(), self._build_request(instances)))
+
+    def _list_instances_url(self):
+        return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/instanceGroups/{name}/listInstances".format(**self.module.params)
+
+    def _remove_instances_url(self):
+        return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/instanceGroups/{name}/removeInstances".format(**self.module.params)
+
+    def _add_instances_url(self):
+        return "https://www.googleapis.com/compute/v1/projects/{project}/zones/{zone}/instanceGroups/{name}/addInstances".format(**self.module.params)
+
+    def _build_request(self, instances):
+        request = {
+            'instances': []
+        }
+        for instance in instances:
+            request['instances'].append({'instance': instance})
+        return request