update magic module-generated resources with at_least_one_of (#2639)

api/type.rb

@@ -70,6 +70,9 @@ module Fields
       # A list of properties that conflict with this property.
       attr_reader :conflicts
 
+      # A list of properties that at least one of must be set.
+      attr_reader :at_least_one_of
+
       # Can only be overridden - we should never set this ourselves.
       attr_reader :new_type
 
@@ -109,6 +112,7 @@ def validate
 
       check_default_value_property
       check_conflicts
+      check_at_least_one_of
     end
 
     def to_s
@@ -135,6 +139,8 @@ def to_json(opts = nil)
       instance_variables.each do |v|
         if v == :@conflicts && instance_variable_get(v).empty?
           # ignore empty conflict arrays
+        elsif v == :@at_least_one_of && instance_variable_get(v).empty?
+          # ignore empty at_least_one_of arrays
         elsif instance_variable_get(v) == false || instance_variable_get(v).nil?
           # ignore false booleans as non-existence indicates falsey
         elsif !ignored_fields.include? v
@@ -194,6 +200,22 @@ def conflicting
        @__resource.all_user_properties.select { |p| p.conflicts.include?(@api_name) }).uniq
     end
 
+    # Checks that all properties that needs at least one of their fields actually exist.
+    # This currently just returns if empty, because we don't want to do the check, since
+    # this list will have a full path for nested attributes.
+    def check_at_least_one_of
+      check :at_least_one_of, type: ::Array, default: [], item_type: ::String
+
+      return if @at_least_one_of.empty?
+    end
+
+    # Returns list of properties that needs at least one of their fields set.
+    def at_least_one_of_list
+      return [] unless @__resource
+
+      @at_least_one_of
+    end
+
     def type
       self.class.name.split('::').last
     end
@@ -289,6 +311,7 @@ class FetchedExternal < Type
 
       def validate
         @conflicts ||= []
+        @at_least_one_of ||= []
       end
 
       def api_name

overrides/terraform/property_override.rb

@@ -69,6 +69,9 @@ def self.attributes
           # Names of attributes that can't be set alongside this one
           :conflicts_with,
 
+          # Names of attributes that at least one of must be set
+          :at_least_one_of,
+
           # Names of fields that should be included in the updateMask.
           :update_mask_fields,
 

products/accesscontextmanager/api.yaml

@@ -376,6 +376,10 @@ objects:
               A list of GCP resources that are inside of the service perimeter.
               Currently only projects are allowed.
               Format: projects/{project_number}
+            at_least_one_of:
+              - status.0.resources
+              - status.0.access_levels
+              - status.0.restricted_services
             item_type: Api::Type::String
           - !ruby/object:Api::Type::Array
             name: 'accessLevels'
@@ -390,6 +394,10 @@ objects:
               be empty.
 
               Format: accessPolicies/{policy_id}/accessLevels/{access_level_name}
+            at_least_one_of:
+              - status.0.resources
+              - status.0.access_levels
+              - status.0.restricted_services
             item_type: Api::Type::String
           - !ruby/object:Api::Type::Array
             name: 'restrictedServices'
@@ -399,4 +407,8 @@ objects:
               `storage.googleapis.com` is specified, access to the storage
               buckets inside the perimeter must meet the perimeter's access
               restrictions.
+            at_least_one_of:
+              - status.0.resources
+              - status.0.access_levels
+              - status.0.restricted_services
             item_type: Api::Type::String

products/appengine/api.yaml

@@ -404,6 +404,9 @@ objects:
             name: 'zip'
             description: 'Zip File'
             required: false
+            at_least_one_of:
+              - deployment.0.zip
+              - deployment.0.files
             properties:
               - !ruby/object:Api::Type::String
                 name: 'sourceUrl'
@@ -419,6 +422,9 @@ objects:
               Manifest of the files stored in Google Cloud Storage that are included as part of this version.
               All files must be readable using the credentials supplied with this call.
             required: false
+            at_least_one_of:
+              - deployment.0.zip
+              - deployment.0.files
             key_name: 'name'
             key_description: |
               name of file

products/cloudrun/api.yaml

@@ -354,6 +354,7 @@ objects:
                     properties:
                     - !ruby/object:Api::Type::String
                       name: name
+                      required: true
                       description: |-
                         Name of the referent.
                         More info:
@@ -369,6 +370,7 @@ objects:
                     properties:
                     - !ruby/object:Api::Type::String
                       name: name
+                      required: true
                       description: |-
                         Name of the referent.
                         More info:

products/cloudscheduler/api.yaml

@@ -90,6 +90,12 @@ objects:
               Values greater than 5 and negative values are not allowed.
             required: false
             input: true
+            at_least_one_of:
+              - retry_config.0.retry_count
+              - retry_config.0.max_retry_duration
+              - retry_config.0.min_backoff_duration
+              - retry_config.0.max_backoff_duration
+              - retry_config.0.max_doublings
           - !ruby/object:Api::Type::String
             name: maxRetryDuration
             description: |
@@ -98,20 +104,38 @@ objects:
               A duration in seconds with up to nine fractional digits, terminated by 's'.
             required: false
             input: true
+            at_least_one_of:
+              - retry_config.0.retry_count
+              - retry_config.0.max_retry_duration
+              - retry_config.0.min_backoff_duration
+              - retry_config.0.max_backoff_duration
+              - retry_config.0.max_doublings
           - !ruby/object:Api::Type::String
             name: minBackoffDuration
             description: |
               The minimum amount of time to wait before retrying a job after it fails.
               A duration in seconds with up to nine fractional digits, terminated by 's'.
             required: false
             input: true
+            at_least_one_of:
+              - retry_config.0.retry_count
+              - retry_config.0.max_retry_duration
+              - retry_config.0.min_backoff_duration
+              - retry_config.0.max_backoff_duration
+              - retry_config.0.max_doublings
           - !ruby/object:Api::Type::String
             name: maxBackoffDuration
             description: |
               The maximum amount of time to wait before retrying a job after it fails.
               A duration in seconds with up to nine fractional digits, terminated by 's'.
             required: false
             input: true
+            at_least_one_of:
+              - retry_config.0.retry_count
+              - retry_config.0.max_retry_duration
+              - retry_config.0.min_backoff_duration
+              - retry_config.0.max_backoff_duration
+              - retry_config.0.max_doublings
           - !ruby/object:Api::Type::Integer
             name: maxDoublings
             description: |
@@ -121,6 +145,12 @@ objects:
               and finally retries retries at intervals of maxBackoffDuration up to retryCount times.
             required: false
             input: true
+            at_least_one_of:
+              - retry_config.0.retry_count
+              - retry_config.0.max_retry_duration
+              - retry_config.0.min_backoff_duration
+              - retry_config.0.max_backoff_duration
+              - retry_config.0.max_doublings
       - !ruby/object:Api::Type::NestedObject
         name: pubsubTarget
         description: |
@@ -183,20 +213,32 @@ objects:
                 description: |
                   App service.
                   By default, the job is sent to the service which is the default service when the job is attempted.
+                at_least_one_of:
+                  - app_engine_http_target.0.app_engine_routing.0.service
+                  - app_engine_http_target.0.app_engine_routing.0.version
+                  - app_engine_http_target.0.app_engine_routing.0.instance
                 required: false
                 input: true
               - !ruby/object:Api::Type::String
                 name: version
                 description: |
                   App version.
                   By default, the job is sent to the version which is the default version when the job is attempted.
+                at_least_one_of:
+                  - app_engine_http_target.0.app_engine_routing.0.service
+                  - app_engine_http_target.0.app_engine_routing.0.version
+                  - app_engine_http_target.0.app_engine_routing.0.instance
                 required: false
                 input: true
               - !ruby/object:Api::Type::String
                 name: instance
                 description: |
                   App instance.
                   By default, the job is sent to an instance which is available when the job is attempted.
+                at_least_one_of:
+                  - app_engine_http_target.0.app_engine_routing.0.service
+                  - app_engine_http_target.0.app_engine_routing.0.version
+                  - app_engine_http_target.0.app_engine_routing.0.instance
                 required: false
                 input: true
           - !ruby/object:Api::Type::String