diff --git a/api_names_out.yaml b/api_names_out.yaml index 65570022b81..38a5824fa61 100644 --- a/api_names_out.yaml +++ b/api_names_out.yaml @@ -28940,6 +28940,13 @@ "/commentanalyzer:v1alpha1/fields": fields "/commentanalyzer:v1alpha1/key": key "/commentanalyzer:v1alpha1/quotaUser": quota_user +"/composer:v1/AllowedIpRange": allowed_ip_range +"/composer:v1/AllowedIpRange/description": description +"/composer:v1/AllowedIpRange/value": value +"/composer:v1/Date": date +"/composer:v1/Date/day": day +"/composer:v1/Date/month": month +"/composer:v1/Date/year": year "/composer:v1/Empty": empty "/composer:v1/Environment": environment "/composer:v1/Environment/config": config @@ -28958,6 +28965,7 @@ "/composer:v1/EnvironmentConfig/nodeCount": node_count "/composer:v1/EnvironmentConfig/privateEnvironmentConfig": private_environment_config "/composer:v1/EnvironmentConfig/softwareConfig": software_config +"/composer:v1/EnvironmentConfig/webServerNetworkAccessControl": web_server_network_access_control "/composer:v1/IPAllocationPolicy": ip_allocation_policy "/composer:v1/IPAllocationPolicy/clusterIpv4CidrBlock": cluster_ipv4_cidr_block "/composer:v1/IPAllocationPolicy/clusterSecondaryRangeName": cluster_secondary_range_name @@ -28965,10 +28973,13 @@ "/composer:v1/IPAllocationPolicy/servicesSecondaryRangeName": services_secondary_range_name "/composer:v1/IPAllocationPolicy/useIpAliases": use_ip_aliases "/composer:v1/ImageVersion": image_version +"/composer:v1/ImageVersion/creationDisabled": creation_disabled "/composer:v1/ImageVersion/imageVersionId": image_version_id "/composer:v1/ImageVersion/isDefault": is_default +"/composer:v1/ImageVersion/releaseDate": release_date "/composer:v1/ImageVersion/supportedPythonVersions": supported_python_versions "/composer:v1/ImageVersion/supportedPythonVersions/supported_python_version": supported_python_version +"/composer:v1/ImageVersion/upgradeDisabled": upgrade_disabled "/composer:v1/ListEnvironmentsResponse": list_environments_response "/composer:v1/ListEnvironmentsResponse/environments": environments "/composer:v1/ListEnvironmentsResponse/environments/environment": environment @@ -29033,6 +29044,9 @@ "/composer:v1/Status/details/detail": detail "/composer:v1/Status/details/detail/detail": detail "/composer:v1/Status/message": message +"/composer:v1/WebServerNetworkAccessControl": web_server_network_access_control +"/composer:v1/WebServerNetworkAccessControl/allowedIpRanges": allowed_ip_ranges +"/composer:v1/WebServerNetworkAccessControl/allowedIpRanges/allowed_ip_range": allowed_ip_range "/composer:v1/composer.projects.locations.environments.create": create_project_location_environment "/composer:v1/composer.projects.locations.environments.create/parent": parent "/composer:v1/composer.projects.locations.environments.delete": delete_project_location_environment @@ -29047,6 +29061,7 @@ "/composer:v1/composer.projects.locations.environments.patch/name": name "/composer:v1/composer.projects.locations.environments.patch/updateMask": update_mask "/composer:v1/composer.projects.locations.imageVersions.list": list_project_location_image_versions +"/composer:v1/composer.projects.locations.imageVersions.list/includePastReleases": include_past_releases "/composer:v1/composer.projects.locations.imageVersions.list/pageSize": page_size "/composer:v1/composer.projects.locations.imageVersions.list/pageToken": page_token "/composer:v1/composer.projects.locations.imageVersions.list/parent": parent diff --git a/generated/google/apis/composer_v1.rb b/generated/google/apis/composer_v1.rb index a565c59b8bb..b03d001bad1 100644 --- a/generated/google/apis/composer_v1.rb +++ b/generated/google/apis/composer_v1.rb @@ -25,7 +25,7 @@ module Apis # @see https://cloud.google.com/composer/ module ComposerV1 VERSION = 'V1' - REVISION = '20201002' + REVISION = '20201202' # View and manage your data across Google Cloud Platform services AUTH_CLOUD_PLATFORM = 'https://www.googleapis.com/auth/cloud-platform' diff --git a/generated/google/apis/composer_v1/classes.rb b/generated/google/apis/composer_v1/classes.rb index 9c280c9b348..b9d862bd233 100644 --- a/generated/google/apis/composer_v1/classes.rb +++ b/generated/google/apis/composer_v1/classes.rb @@ -22,6 +22,76 @@ module Google module Apis module ComposerV1 + # Allowed IP range with user-provided description. + class AllowedIpRange + include Google::Apis::Core::Hashable + + # Optional. User-provided description. It must contain at most 300 characters. + # Corresponds to the JSON property `description` + # @return [String] + attr_accessor :description + + # IP address or range, defined using CIDR notation, of requests that this rule + # applies to. Examples: `192.168.1.1` or `192.168.0.0/16` or `2001:db8::/32` or ` + # 2001:0db8:0000:0042:0000:8a2e:0370:7334`. IP range prefixes should be properly + # truncated. For example, `1.2.3.4/24` should be truncated to `1.2.3.0/24`. + # Similarly, for IPv6, `2001:db8::1/32` should be truncated to `2001:db8::/32`. + # Corresponds to the JSON property `value` + # @return [String] + attr_accessor :value + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @description = args[:description] if args.key?(:description) + @value = args[:value] if args.key?(:value) + end + end + + # Represents a whole or partial calendar date, such as a birthday. The time of + # day and time zone are either specified elsewhere or are insignificant. The + # date is relative to the Gregorian Calendar. This can represent one of the + # following: * A full date, with non-zero year, month, and day values * A month + # and day value, with a zero year, such as an anniversary * A year on its own, + # with zero month and day values * A year and month value, with a zero day, such + # as a credit card expiration date Related types are google.type.TimeOfDay and ` + # google.protobuf.Timestamp`. + class Date + include Google::Apis::Core::Hashable + + # Day of a month. Must be from 1 to 31 and valid for the year and month, or 0 to + # specify a year by itself or a year and month where the day isn't significant. + # Corresponds to the JSON property `day` + # @return [Fixnum] + attr_accessor :day + + # Month of a year. Must be from 1 to 12, or 0 to specify a year without a month + # and day. + # Corresponds to the JSON property `month` + # @return [Fixnum] + attr_accessor :month + + # Year of the date. Must be from 1 to 9999, or 0 to specify a date without a + # year. + # Corresponds to the JSON property `year` + # @return [Fixnum] + attr_accessor :year + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @day = args[:day] if args.key?(:day) + @month = args[:month] if args.key?(:month) + @year = args[:year] if args.key?(:year) + end + end + # A generic empty message that you can re-use to avoid defining duplicated empty # messages in your APIs. A typical example is to use it as the request or the # response type of an API method. For instance: service Foo ` rpc Bar(google. @@ -149,6 +219,11 @@ class EnvironmentConfig # @return [Google::Apis::ComposerV1::SoftwareConfig] attr_accessor :software_config + # Network-level access control policy for the Airflow web server. + # Corresponds to the JSON property `webServerNetworkAccessControl` + # @return [Google::Apis::ComposerV1::WebServerNetworkAccessControl] + attr_accessor :web_server_network_access_control + def initialize(**args) update!(**args) end @@ -162,6 +237,7 @@ def update!(**args) @node_count = args[:node_count] if args.key?(:node_count) @private_environment_config = args[:private_environment_config] if args.key?(:private_environment_config) @software_config = args[:software_config] if args.key?(:software_config) + @web_server_network_access_control = args[:web_server_network_access_control] if args.key?(:web_server_network_access_control) end end @@ -230,6 +306,12 @@ def update!(**args) class ImageVersion include Google::Apis::Core::Hashable + # Whether it is impossible to create an environment with the image version. + # Corresponds to the JSON property `creationDisabled` + # @return [Boolean] + attr_accessor :creation_disabled + alias_method :creation_disabled?, :creation_disabled + # The string identifier of the ImageVersion, in the form: "composer-x.y.z- # airflow-a.b(.c)" # Corresponds to the JSON property `imageVersionId` @@ -243,20 +325,42 @@ class ImageVersion attr_accessor :is_default alias_method :is_default?, :is_default + # Represents a whole or partial calendar date, such as a birthday. The time of + # day and time zone are either specified elsewhere or are insignificant. The + # date is relative to the Gregorian Calendar. This can represent one of the + # following: * A full date, with non-zero year, month, and day values * A month + # and day value, with a zero year, such as an anniversary * A year on its own, + # with zero month and day values * A year and month value, with a zero day, such + # as a credit card expiration date Related types are google.type.TimeOfDay and ` + # google.protobuf.Timestamp`. + # Corresponds to the JSON property `releaseDate` + # @return [Google::Apis::ComposerV1::Date] + attr_accessor :release_date + # supported python versions # Corresponds to the JSON property `supportedPythonVersions` # @return [Array] attr_accessor :supported_python_versions + # Whether it is impossible to upgrade an environment running with the image + # version. + # Corresponds to the JSON property `upgradeDisabled` + # @return [Boolean] + attr_accessor :upgrade_disabled + alias_method :upgrade_disabled?, :upgrade_disabled + def initialize(**args) update!(**args) end # Update properties of this object def update!(**args) + @creation_disabled = args[:creation_disabled] if args.key?(:creation_disabled) @image_version_id = args[:image_version_id] if args.key?(:image_version_id) @is_default = args[:is_default] if args.key?(:is_default) + @release_date = args[:release_date] if args.key?(:release_date) @supported_python_versions = args[:supported_python_versions] if args.key?(:supported_python_versions) + @upgrade_disabled = args[:upgrade_disabled] if args.key?(:upgrade_disabled) end end @@ -767,6 +871,25 @@ def update!(**args) @message = args[:message] if args.key?(:message) end end + + # Network-level access control policy for the Airflow web server. + class WebServerNetworkAccessControl + include Google::Apis::Core::Hashable + + # A collection of allowed IP ranges with descriptions. + # Corresponds to the JSON property `allowedIpRanges` + # @return [Array] + attr_accessor :allowed_ip_ranges + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @allowed_ip_ranges = args[:allowed_ip_ranges] if args.key?(:allowed_ip_ranges) + end + end end end end diff --git a/generated/google/apis/composer_v1/representations.rb b/generated/google/apis/composer_v1/representations.rb index cad89b2b2ef..f837831d1eb 100644 --- a/generated/google/apis/composer_v1/representations.rb +++ b/generated/google/apis/composer_v1/representations.rb @@ -22,6 +22,18 @@ module Google module Apis module ComposerV1 + class AllowedIpRange + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + + class Date + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + class Empty class Representation < Google::Apis::Core::JsonRepresentation; end @@ -112,6 +124,29 @@ class Representation < Google::Apis::Core::JsonRepresentation; end include Google::Apis::Core::JsonObjectSupport end + class WebServerNetworkAccessControl + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + + class AllowedIpRange + # @private + class Representation < Google::Apis::Core::JsonRepresentation + property :description, as: 'description' + property :value, as: 'value' + end + end + + class Date + # @private + class Representation < Google::Apis::Core::JsonRepresentation + property :day, as: 'day' + property :month, as: 'month' + property :year, as: 'year' + end + end + class Empty # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -145,6 +180,8 @@ class Representation < Google::Apis::Core::JsonRepresentation property :software_config, as: 'softwareConfig', class: Google::Apis::ComposerV1::SoftwareConfig, decorator: Google::Apis::ComposerV1::SoftwareConfig::Representation + property :web_server_network_access_control, as: 'webServerNetworkAccessControl', class: Google::Apis::ComposerV1::WebServerNetworkAccessControl, decorator: Google::Apis::ComposerV1::WebServerNetworkAccessControl::Representation + end end @@ -162,9 +199,13 @@ class Representation < Google::Apis::Core::JsonRepresentation class ImageVersion # @private class Representation < Google::Apis::Core::JsonRepresentation + property :creation_disabled, as: 'creationDisabled' property :image_version_id, as: 'imageVersionId' property :is_default, as: 'isDefault' + property :release_date, as: 'releaseDate', class: Google::Apis::ComposerV1::Date, decorator: Google::Apis::ComposerV1::Date::Representation + collection :supported_python_versions, as: 'supportedPythonVersions' + property :upgrade_disabled, as: 'upgradeDisabled' end end @@ -275,6 +316,14 @@ class Representation < Google::Apis::Core::JsonRepresentation property :message, as: 'message' end end + + class WebServerNetworkAccessControl + # @private + class Representation < Google::Apis::Core::JsonRepresentation + collection :allowed_ip_ranges, as: 'allowedIpRanges', class: Google::Apis::ComposerV1::AllowedIpRange, decorator: Google::Apis::ComposerV1::AllowedIpRange::Representation + + end + end end end end diff --git a/generated/google/apis/composer_v1/service.rb b/generated/google/apis/composer_v1/service.rb index a294ebfcf0c..4b7b23151fc 100644 --- a/generated/google/apis/composer_v1/service.rb +++ b/generated/google/apis/composer_v1/service.rb @@ -227,20 +227,21 @@ def list_project_location_environments(parent, page_size: nil, page_token: nil, # provide both a mask of this form and the "labels" mask. config.nodeCount # Horizontally scale the number of nodes in the environment. An integer greater # than or equal to 3 must be provided in the `config.nodeCount` field. config. - # softwareConfig.airflowConfigOverrides Replace all Apache Airflow config - # overrides. If a replacement config overrides map is not included in ` - # environment`, all config overrides are cleared. It is an error to provide both - # this mask and a mask specifying one or more individual config overrides. - # config.softwareConfig.airflowConfigOverrides.section-name Override the Apache - # Airflow config property name in the section named section, preserving other - # properties. To delete the property override, include it in `updateMask` and - # omit its mapping in `environment.config.softwareConfig.airflowConfigOverrides`. - # It is an error to provide both a mask of this form and the "config. - # softwareConfig.airflowConfigOverrides" mask. config.softwareConfig. - # envVariables Replace all environment variables. If a replacement environment - # variable map is not included in `environment`, all custom environment - # variables are cleared. It is an error to provide both this mask and a mask - # specifying one or more individual environment variables. + # webServerNetworkAccessControl Replace the environment's current + # WebServerNetworkAccessControl. config.softwareConfig.airflowConfigOverrides + # Replace all Apache Airflow config overrides. If a replacement config overrides + # map is not included in `environment`, all config overrides are cleared. It is + # an error to provide both this mask and a mask specifying one or more + # individual config overrides. config.softwareConfig.airflowConfigOverrides. + # section-name Override the Apache Airflow config property name in the section + # named section, preserving other properties. To delete the property override, + # include it in `updateMask` and omit its mapping in `environment.config. + # softwareConfig.airflowConfigOverrides`. It is an error to provide both a mask + # of this form and the "config.softwareConfig.airflowConfigOverrides" mask. + # config.softwareConfig.envVariables Replace all environment variables. If a + # replacement environment variable map is not included in `environment`, all + # custom environment variables are cleared. It is an error to provide both this + # mask and a mask specifying one or more individual environment variables. # @param [String] fields # Selector specifying which fields to include in a partial response. # @param [String] quota_user @@ -275,6 +276,8 @@ def patch_project_location_environment(name, environment_object = nil, update_ma # @param [String] parent # List ImageVersions in the given project and location, in the form: "projects/` # projectId`/locations/`locationId`" + # @param [Boolean] include_past_releases + # Whether or not image versions from old releases should be included. # @param [Fixnum] page_size # The maximum number of image_versions to return. # @param [String] page_token @@ -296,11 +299,12 @@ def patch_project_location_environment(name, environment_object = nil, update_ma # @raise [Google::Apis::ServerError] An error occurred on the server and the request can be retried # @raise [Google::Apis::ClientError] The request is invalid and should not be retried without modification # @raise [Google::Apis::AuthorizationError] Authorization is required - def list_project_location_image_versions(parent, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block) + def list_project_location_image_versions(parent, include_past_releases: nil, page_size: nil, page_token: nil, fields: nil, quota_user: nil, options: nil, &block) command = make_simple_command(:get, 'v1/{+parent}/imageVersions', options) command.response_representation = Google::Apis::ComposerV1::ListImageVersionsResponse::Representation command.response_class = Google::Apis::ComposerV1::ListImageVersionsResponse command.params['parent'] = parent unless parent.nil? + command.query['includePastReleases'] = include_past_releases unless include_past_releases.nil? command.query['pageSize'] = page_size unless page_size.nil? command.query['pageToken'] = page_token unless page_token.nil? command.query['fields'] = fields unless fields.nil? diff --git a/generated/google/apis/composer_v1/synth.metadata b/generated/google/apis/composer_v1/synth.metadata index 429012f74d2..6411dc01311 100644 --- a/generated/google/apis/composer_v1/synth.metadata +++ b/generated/google/apis/composer_v1/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-ruby-client.git", - "sha": "c98c719bbab68d0890524d53f8b629d7858af9c2" + "sha": "949844223ecbdb701c9f0062f48bfefe5391ea7c" } } ]