diff --git a/api_names_out.yaml b/api_names_out.yaml index 6c393f929..07815f7ac 100644 --- a/api_names_out.yaml +++ b/api_names_out.yaml @@ -29541,6 +29541,8 @@ "/composer:v1/AllowedIpRange": allowed_ip_range "/composer:v1/AllowedIpRange/description": description "/composer:v1/AllowedIpRange/value": value +"/composer:v1/DatabaseConfig": database_config +"/composer:v1/DatabaseConfig/machineType": machine_type "/composer:v1/Date": date "/composer:v1/Date/day": day "/composer:v1/Date/month": month @@ -29558,11 +29560,13 @@ "/composer:v1/EnvironmentConfig": environment_config "/composer:v1/EnvironmentConfig/airflowUri": airflow_uri "/composer:v1/EnvironmentConfig/dagGcsPrefix": dag_gcs_prefix +"/composer:v1/EnvironmentConfig/databaseConfig": database_config "/composer:v1/EnvironmentConfig/gkeCluster": gke_cluster "/composer:v1/EnvironmentConfig/nodeConfig": node_config "/composer:v1/EnvironmentConfig/nodeCount": node_count "/composer:v1/EnvironmentConfig/privateEnvironmentConfig": private_environment_config "/composer:v1/EnvironmentConfig/softwareConfig": software_config +"/composer:v1/EnvironmentConfig/webServerConfig": web_server_config "/composer:v1/EnvironmentConfig/webServerNetworkAccessControl": web_server_network_access_control "/composer:v1/IPAllocationPolicy": ip_allocation_policy "/composer:v1/IPAllocationPolicy/clusterIpv4CidrBlock": cluster_ipv4_cidr_block @@ -29642,6 +29646,8 @@ "/composer:v1/Status/details/detail": detail "/composer:v1/Status/details/detail/detail": detail "/composer:v1/Status/message": message +"/composer:v1/WebServerConfig": web_server_config +"/composer:v1/WebServerConfig/machineType": machine_type "/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 diff --git a/generated/google-apis-composer_v1/CHANGELOG.md b/generated/google-apis-composer_v1/CHANGELOG.md index d0b27eff2..5131ea07f 100644 --- a/generated/google-apis-composer_v1/CHANGELOG.md +++ b/generated/google-apis-composer_v1/CHANGELOG.md @@ -1,5 +1,9 @@ # Release history for google-apis-composer_v1 +### v0.2.0 (2021-01-15) + +* Regenerated from discovery document revision 20210109 + ### v0.1.0 (2021-01-07) * Regenerated using generator version 0.1.1 diff --git a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/classes.rb b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/classes.rb index 3d5495742..f7efe748e 100644 --- a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/classes.rb +++ b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/classes.rb @@ -51,6 +51,28 @@ module Google end end + # The configuration of Cloud SQL instance that is used by the Apache Airflow + # software. + class DatabaseConfig + include Google::Apis::Core::Hashable + + # Optional. Cloud SQL machine type used by Airflow database. It has to be one of: + # db-n1-standard-2, db-n1-standard-4, db-n1-standard-8 or db-n1-standard-16. If + # not specified, db-n1-standard-2 will be used. + # Corresponds to the JSON property `machineType` + # @return [String] + attr_accessor :machine_type + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @machine_type = args[:machine_type] if args.key?(:machine_type) + 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 @@ -191,6 +213,12 @@ module Google # @return [String] attr_accessor :dag_gcs_prefix + # The configuration of Cloud SQL instance that is used by the Apache Airflow + # software. + # Corresponds to the JSON property `databaseConfig` + # @return [Google::Apis::ComposerV1::DatabaseConfig] + attr_accessor :database_config + # Output only. The Kubernetes Engine cluster used to run this environment. # Corresponds to the JSON property `gkeCluster` # @return [String] @@ -219,6 +247,11 @@ module Google # @return [Google::Apis::ComposerV1::SoftwareConfig] attr_accessor :software_config + # The configuration settings for the Airflow web server App Engine instance. + # Corresponds to the JSON property `webServerConfig` + # @return [Google::Apis::ComposerV1::WebServerConfig] + attr_accessor :web_server_config + # Network-level access control policy for the Airflow web server. # Corresponds to the JSON property `webServerNetworkAccessControl` # @return [Google::Apis::ComposerV1::WebServerNetworkAccessControl] @@ -232,11 +265,13 @@ module Google def update!(**args) @airflow_uri = args[:airflow_uri] if args.key?(:airflow_uri) @dag_gcs_prefix = args[:dag_gcs_prefix] if args.key?(:dag_gcs_prefix) + @database_config = args[:database_config] if args.key?(:database_config) @gke_cluster = args[:gke_cluster] if args.key?(:gke_cluster) @node_config = args[:node_config] if args.key?(:node_config) @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_config = args[:web_server_config] if args.key?(:web_server_config) @web_server_network_access_control = args[:web_server_network_access_control] if args.key?(:web_server_network_access_control) end end @@ -872,6 +907,29 @@ module Google end end + # The configuration settings for the Airflow web server App Engine instance. + class WebServerConfig + include Google::Apis::Core::Hashable + + # Optional. Machine type on which Airflow web server is running. It has to be + # one of: composer-n1-webserver-2, composer-n1-webserver-4 or composer-n1- + # webserver-8. If not specified, composer-n1-webserver-2 will be used. Value + # custom is returned only in response, if Airflow web server parameters were + # manually changed to a non-standard values. + # Corresponds to the JSON property `machineType` + # @return [String] + attr_accessor :machine_type + + def initialize(**args) + update!(**args) + end + + # Update properties of this object + def update!(**args) + @machine_type = args[:machine_type] if args.key?(:machine_type) + end + end + # Network-level access control policy for the Airflow web server. class WebServerNetworkAccessControl include Google::Apis::Core::Hashable diff --git a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/gem_version.rb b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/gem_version.rb index cd246846d..884c569cb 100644 --- a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/gem_version.rb +++ b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/gem_version.rb @@ -16,13 +16,13 @@ module Google module Apis module ComposerV1 # Version of the google-apis-composer_v1 gem - GEM_VERSION = "0.1.0" + GEM_VERSION = "0.2.0" # Version of the code generator used to generate this client GENERATOR_VERSION = "0.1.1" # Revision of the discovery document this client was generated from - REVISION = "20201202" + REVISION = "20210109" end end end diff --git a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/representations.rb b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/representations.rb index 069217210..f20933ea3 100644 --- a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/representations.rb +++ b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/representations.rb @@ -28,6 +28,12 @@ module Google include Google::Apis::Core::JsonObjectSupport end + class DatabaseConfig + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + class Date class Representation < Google::Apis::Core::JsonRepresentation; end @@ -124,6 +130,12 @@ module Google include Google::Apis::Core::JsonObjectSupport end + class WebServerConfig + class Representation < Google::Apis::Core::JsonRepresentation; end + + include Google::Apis::Core::JsonObjectSupport + end + class WebServerNetworkAccessControl class Representation < Google::Apis::Core::JsonRepresentation; end @@ -138,6 +150,13 @@ module Google end end + class DatabaseConfig + # @private + class Representation < Google::Apis::Core::JsonRepresentation + property :machine_type, as: 'machineType' + end + end + class Date # @private class Representation < Google::Apis::Core::JsonRepresentation @@ -172,6 +191,8 @@ module Google class Representation < Google::Apis::Core::JsonRepresentation property :airflow_uri, as: 'airflowUri' property :dag_gcs_prefix, as: 'dagGcsPrefix' + property :database_config, as: 'databaseConfig', class: Google::Apis::ComposerV1::DatabaseConfig, decorator: Google::Apis::ComposerV1::DatabaseConfig::Representation + property :gke_cluster, as: 'gkeCluster' property :node_config, as: 'nodeConfig', class: Google::Apis::ComposerV1::NodeConfig, decorator: Google::Apis::ComposerV1::NodeConfig::Representation @@ -180,6 +201,8 @@ module Google property :software_config, as: 'softwareConfig', class: Google::Apis::ComposerV1::SoftwareConfig, decorator: Google::Apis::ComposerV1::SoftwareConfig::Representation + property :web_server_config, as: 'webServerConfig', class: Google::Apis::ComposerV1::WebServerConfig, decorator: Google::Apis::ComposerV1::WebServerConfig::Representation + property :web_server_network_access_control, as: 'webServerNetworkAccessControl', class: Google::Apis::ComposerV1::WebServerNetworkAccessControl, decorator: Google::Apis::ComposerV1::WebServerNetworkAccessControl::Representation end @@ -317,6 +340,13 @@ module Google end end + class WebServerConfig + # @private + class Representation < Google::Apis::Core::JsonRepresentation + property :machine_type, as: 'machineType' + end + end + class WebServerNetworkAccessControl # @private class Representation < Google::Apis::Core::JsonRepresentation diff --git a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/service.rb b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/service.rb index 20fc0cf62..e618d132a 100644 --- a/generated/google-apis-composer_v1/lib/google/apis/composer_v1/service.rb +++ b/generated/google-apis-composer_v1/lib/google/apis/composer_v1/service.rb @@ -230,17 +230,19 @@ module Google # 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. # 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 + # WebServerNetworkAccessControl. config.databaseConfig Replace the environment's + # current DatabaseConfig. config.webServerConfig Replace the environment's + # current WebServerConfig. 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. diff --git a/generated/google-apis-composer_v1/synth.metadata b/generated/google-apis-composer_v1/synth.metadata index 6411dc013..aba87b648 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": "949844223ecbdb701c9f0062f48bfefe5391ea7c" + "sha": "07d324a302ced59c0fdbeca7f646f00c2fac75df" } } ]