diff --git a/composer/v1/composer-api.json b/composer/v1/composer-api.json index cf46eed0e8a..2347e7063fa 100644 --- a/composer/v1/composer-api.json +++ b/composer/v1/composer-api.json @@ -599,7 +599,7 @@ } } }, - "revision": "20230917", + "revision": "20231004", "rootUrl": "https://composer.googleapis.com/", "schemas": { "AllowedIpRange": { @@ -682,6 +682,10 @@ "machineType": { "description": "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. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.", "type": "string" + }, + "zone": { + "description": "Optional. The Compute Engine zone where the Airflow database is created. If zone is provided, it must be in the region selected for the environment. If zone is not provided, a zone is automatically selected. The zone can only be set during environment creation. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.*.", + "type": "string" } }, "type": "object" @@ -1675,7 +1679,12 @@ "StorageConfig": { "description": "The configuration for data storage in the environment.", "id": "StorageConfig", - "properties": {}, + "properties": { + "bucket": { + "description": "Optional. The name of the Cloud Storage bucket used by the environment. No `gs://` prefix.", + "type": "string" + } + }, "type": "object" }, "TriggererResource": { diff --git a/composer/v1/composer-gen.go b/composer/v1/composer-gen.go index 7fe3c471719..bed6e1cbe19 100644 --- a/composer/v1/composer-gen.go +++ b/composer/v1/composer-gen.go @@ -338,6 +338,14 @@ type DatabaseConfig struct { // environments in versions composer-1.*.*-airflow-*.*.*. MachineType string `json:"machineType,omitempty"` + // Zone: Optional. The Compute Engine zone where the Airflow database is + // created. If zone is provided, it must be in the region selected for + // the environment. If zone is not provided, a zone is automatically + // selected. The zone can only be set during environment creation. + // Supported for Cloud Composer environments in versions + // composer-2.*.*-airflow-*.*.*. + Zone string `json:"zone,omitempty"` + // ForceSendFields is a list of field names (e.g. "MachineType") to // unconditionally include in API requests. By default, fields with // empty or default values are omitted from API requests. However, any @@ -2142,6 +2150,31 @@ func (s *StopAirflowCommandResponse) MarshalJSON() ([]byte, error) { // StorageConfig: The configuration for data storage in the environment. type StorageConfig struct { + // Bucket: Optional. The name of the Cloud Storage bucket used by the + // environment. No `gs://` prefix. + Bucket string `json:"bucket,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Bucket") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Bucket") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *StorageConfig) MarshalJSON() ([]byte, error) { + type NoMethod StorageConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } // TriggererResource: Configuration for resources used by Airflow diff --git a/composer/v1beta1/composer-api.json b/composer/v1beta1/composer-api.json index 17159359129..bd82d50d2af 100644 --- a/composer/v1beta1/composer-api.json +++ b/composer/v1beta1/composer-api.json @@ -655,7 +655,7 @@ } } }, - "revision": "20230917", + "revision": "20231004", "rootUrl": "https://composer.googleapis.com/", "schemas": { "AllowedIpRange": { @@ -760,6 +760,10 @@ "machineType": { "description": "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. Supported for Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.", "type": "string" + }, + "zone": { + "description": "Optional. The Compute Engine zone where the Airflow database is created. If zone is provided, it must be in the region selected for the environment. If zone is not provided, a zone is automatically selected. The zone can only be set during environment creation. Supported for Cloud Composer environments in versions composer-2.*.*-airflow-*.*.*.", + "type": "string" } }, "type": "object" @@ -1772,7 +1776,12 @@ "StorageConfig": { "description": "The configuration for data storage in the environment.", "id": "StorageConfig", - "properties": {}, + "properties": { + "bucket": { + "description": "Optional. The name of the Cloud Storage bucket used by the environment. No `gs://` prefix.", + "type": "string" + } + }, "type": "object" }, "TriggererResource": { diff --git a/composer/v1beta1/composer-gen.go b/composer/v1beta1/composer-gen.go index ca29979020f..712a0922c4d 100644 --- a/composer/v1beta1/composer-gen.go +++ b/composer/v1beta1/composer-gen.go @@ -418,6 +418,14 @@ type DatabaseConfig struct { // environments in versions composer-1.*.*-airflow-*.*.*. MachineType string `json:"machineType,omitempty"` + // Zone: Optional. The Compute Engine zone where the Airflow database is + // created. If zone is provided, it must be in the region selected for + // the environment. If zone is not provided, a zone is automatically + // selected. The zone can only be set during environment creation. + // Supported for Cloud Composer environments in versions + // composer-2.*.*-airflow-*.*.*. + Zone string `json:"zone,omitempty"` + // ForceSendFields is a list of field names (e.g. "MachineType") to // unconditionally include in API requests. By default, fields with // empty or default values are omitted from API requests. However, any @@ -2250,6 +2258,31 @@ func (s *StopAirflowCommandResponse) MarshalJSON() ([]byte, error) { // StorageConfig: The configuration for data storage in the environment. type StorageConfig struct { + // Bucket: Optional. The name of the Cloud Storage bucket used by the + // environment. No `gs://` prefix. + Bucket string `json:"bucket,omitempty"` + + // ForceSendFields is a list of field names (e.g. "Bucket") to + // unconditionally include in API requests. By default, fields with + // empty or default values are omitted from API requests. However, any + // non-pointer, non-interface field appearing in ForceSendFields will be + // sent to the server regardless of whether the field is empty or not. + // This may be used to include empty fields in Patch requests. + ForceSendFields []string `json:"-"` + + // NullFields is a list of field names (e.g. "Bucket") to include in API + // requests with the JSON null value. By default, fields with empty + // values are omitted from API requests. However, any field with an + // empty value appearing in NullFields will be sent to the server as + // null. It is an error if a field in this list has a non-empty value. + // This may be used to include null fields in Patch requests. + NullFields []string `json:"-"` +} + +func (s *StorageConfig) MarshalJSON() ([]byte, error) { + type NoMethod StorageConfig + raw := NoMethod(*s) + return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields) } // TriggererResource: Configuration for resources used by Airflow