google-apis-composer_v1 0.20.0 → 0.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 83434a4e3c50e28131444b6b46e62ca8505369c2066ebd3d2ccc094d9d9f70fd
|
4
|
+
data.tar.gz: 246f0e07102db77fc657c87e1369d8af3801226cdd7145662bb9447499fbc12b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 48323abcc35e99822fb578cea28429ee8bbb576f94e0632b99fe64a7462d595beeb59c98b84cf70619322436882ea671ea06a2b4e0101a6c07f81f47b22f2bb9
|
7
|
+
data.tar.gz: 6063d21287299c7f607c4e723c8f4e5e9f057a4f59902f5af8760d93f26c038ba852aac0e683eb724a7476ea7e605aeab5bf02d68b9d384b33ec8c622161411a
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,17 @@
|
|
1
1
|
# Release history for google-apis-composer_v1
|
2
2
|
|
3
|
+
### v0.23.0 (2022-05-17)
|
4
|
+
|
5
|
+
* Regenerated from discovery document revision 20220512
|
6
|
+
|
7
|
+
### v0.22.0 (2022-04-01)
|
8
|
+
|
9
|
+
* Regenerated from discovery document revision 20220326
|
10
|
+
|
11
|
+
### v0.21.0 (2022-03-12)
|
12
|
+
|
13
|
+
* Regenerated from discovery document revision 20220307
|
14
|
+
|
3
15
|
### v0.20.0 (2022-02-10)
|
4
16
|
|
5
17
|
* Regenerated from discovery document revision 20220202
|
@@ -96,15 +96,40 @@ module Google
|
|
96
96
|
end
|
97
97
|
end
|
98
98
|
|
99
|
+
# CIDR block with an optional name.
|
100
|
+
class CidrBlock
|
101
|
+
include Google::Apis::Core::Hashable
|
102
|
+
|
103
|
+
# CIDR block that must be specified in CIDR notation.
|
104
|
+
# Corresponds to the JSON property `cidrBlock`
|
105
|
+
# @return [String]
|
106
|
+
attr_accessor :cidr_block
|
107
|
+
|
108
|
+
# User-defined name that identifies the CIDR block.
|
109
|
+
# Corresponds to the JSON property `displayName`
|
110
|
+
# @return [String]
|
111
|
+
attr_accessor :display_name
|
112
|
+
|
113
|
+
def initialize(**args)
|
114
|
+
update!(**args)
|
115
|
+
end
|
116
|
+
|
117
|
+
# Update properties of this object
|
118
|
+
def update!(**args)
|
119
|
+
@cidr_block = args[:cidr_block] if args.key?(:cidr_block)
|
120
|
+
@display_name = args[:display_name] if args.key?(:display_name)
|
121
|
+
end
|
122
|
+
end
|
123
|
+
|
99
124
|
# The configuration of Cloud SQL instance that is used by the Apache Airflow
|
100
|
-
# software.
|
101
|
-
# airflow-*.*.*.
|
125
|
+
# software.
|
102
126
|
class DatabaseConfig
|
103
127
|
include Google::Apis::Core::Hashable
|
104
128
|
|
105
129
|
# Optional. Cloud SQL machine type used by Airflow database. It has to be one of:
|
106
130
|
# db-n1-standard-2, db-n1-standard-4, db-n1-standard-8 or db-n1-standard-16. If
|
107
|
-
# not specified, db-n1-standard-2 will be used.
|
131
|
+
# not specified, db-n1-standard-2 will be used. Supported for Cloud Composer
|
132
|
+
# environments in versions composer-1.*.*-airflow-*.*.*.
|
108
133
|
# Corresponds to the JSON property `machineType`
|
109
134
|
# @return [String]
|
110
135
|
attr_accessor :machine_type
|
@@ -122,11 +147,11 @@ module Google
|
|
122
147
|
# Represents a whole or partial calendar date, such as a birthday. The time of
|
123
148
|
# day and time zone are either specified elsewhere or are insignificant. The
|
124
149
|
# date is relative to the Gregorian Calendar. This can represent one of the
|
125
|
-
# following: * A full date, with non-zero year, month, and day values * A month
|
126
|
-
# and day, with a zero year (
|
127
|
-
# zero month and a zero day * A year and month, with a zero day (
|
128
|
-
# card expiration date) Related types: * google.type.
|
129
|
-
# DateTime * google.protobuf.Timestamp
|
150
|
+
# following: * A full date, with non-zero year, month, and day values. * A month
|
151
|
+
# and day, with a zero year (for example, an anniversary). * A year on its own,
|
152
|
+
# with a zero month and a zero day. * A year and month, with a zero day (for
|
153
|
+
# example, a credit card expiration date). Related types: * google.type.
|
154
|
+
# TimeOfDay * google.type.DateTime * google.protobuf.Timestamp
|
130
155
|
class Date
|
131
156
|
include Google::Apis::Core::Hashable
|
132
157
|
|
@@ -163,8 +188,7 @@ module Google
|
|
163
188
|
# A generic empty message that you can re-use to avoid defining duplicated empty
|
164
189
|
# messages in your APIs. A typical example is to use it as the request or the
|
165
190
|
# response type of an API method. For instance: service Foo ` rpc Bar(google.
|
166
|
-
# protobuf.Empty) returns (google.protobuf.Empty); `
|
167
|
-
# `Empty` is empty JSON object ````.
|
191
|
+
# protobuf.Empty) returns (google.protobuf.Empty); `
|
168
192
|
class Empty
|
169
193
|
include Google::Apis::Core::Hashable
|
170
194
|
|
@@ -283,8 +307,7 @@ module Google
|
|
283
307
|
attr_accessor :dag_gcs_prefix
|
284
308
|
|
285
309
|
# The configuration of Cloud SQL instance that is used by the Apache Airflow
|
286
|
-
# software.
|
287
|
-
# airflow-*.*.*.
|
310
|
+
# software.
|
288
311
|
# Corresponds to the JSON property `databaseConfig`
|
289
312
|
# @return [Google::Apis::ComposerV1::DatabaseConfig]
|
290
313
|
attr_accessor :database_config
|
@@ -317,6 +340,14 @@ module Google
|
|
317
340
|
# @return [Google::Apis::ComposerV1::MaintenanceWindow]
|
318
341
|
attr_accessor :maintenance_window
|
319
342
|
|
343
|
+
# Configuration options for the master authorized networks feature. Enabled
|
344
|
+
# master authorized networks will disallow all external traffic to access
|
345
|
+
# Kubernetes master through HTTPS except traffic from the given CIDR blocks,
|
346
|
+
# Google Compute Engine Public IPs and Google Prod IPs.
|
347
|
+
# Corresponds to the JSON property `masterAuthorizedNetworksConfig`
|
348
|
+
# @return [Google::Apis::ComposerV1::MasterAuthorizedNetworksConfig]
|
349
|
+
attr_accessor :master_authorized_networks_config
|
350
|
+
|
320
351
|
# The configuration information for the Kubernetes Engine nodes running the
|
321
352
|
# Apache Airflow software.
|
322
353
|
# Corresponds to the JSON property `nodeConfig`
|
@@ -373,6 +404,7 @@ module Google
|
|
373
404
|
@environment_size = args[:environment_size] if args.key?(:environment_size)
|
374
405
|
@gke_cluster = args[:gke_cluster] if args.key?(:gke_cluster)
|
375
406
|
@maintenance_window = args[:maintenance_window] if args.key?(:maintenance_window)
|
407
|
+
@master_authorized_networks_config = args[:master_authorized_networks_config] if args.key?(:master_authorized_networks_config)
|
376
408
|
@node_config = args[:node_config] if args.key?(:node_config)
|
377
409
|
@node_count = args[:node_count] if args.key?(:node_count)
|
378
410
|
@private_environment_config = args[:private_environment_config] if args.key?(:private_environment_config)
|
@@ -461,7 +493,7 @@ module Google
|
|
461
493
|
alias_method :creation_disabled?, :creation_disabled
|
462
494
|
|
463
495
|
# The string identifier of the ImageVersion, in the form: "composer-x.y.z-
|
464
|
-
# airflow-a.b
|
496
|
+
# airflow-a.b.c"
|
465
497
|
# Corresponds to the JSON property `imageVersionId`
|
466
498
|
# @return [String]
|
467
499
|
attr_accessor :image_version_id
|
@@ -476,11 +508,11 @@ module Google
|
|
476
508
|
# Represents a whole or partial calendar date, such as a birthday. The time of
|
477
509
|
# day and time zone are either specified elsewhere or are insignificant. The
|
478
510
|
# date is relative to the Gregorian Calendar. This can represent one of the
|
479
|
-
# following: * A full date, with non-zero year, month, and day values * A month
|
480
|
-
# and day, with a zero year (
|
481
|
-
# zero month and a zero day * A year and month, with a zero day (
|
482
|
-
# card expiration date) Related types: * google.type.
|
483
|
-
# DateTime * google.protobuf.Timestamp
|
511
|
+
# following: * A full date, with non-zero year, month, and day values. * A month
|
512
|
+
# and day, with a zero year (for example, an anniversary). * A year on its own,
|
513
|
+
# with a zero month and a zero day. * A year and month, with a zero day (for
|
514
|
+
# example, a credit card expiration date). Related types: * google.type.
|
515
|
+
# TimeOfDay * google.type.DateTime * google.protobuf.Timestamp
|
484
516
|
# Corresponds to the JSON property `releaseDate`
|
485
517
|
# @return [Google::Apis::ComposerV1::Date]
|
486
518
|
attr_accessor :release_date
|
@@ -627,12 +659,41 @@ module Google
|
|
627
659
|
end
|
628
660
|
end
|
629
661
|
|
662
|
+
# Configuration options for the master authorized networks feature. Enabled
|
663
|
+
# master authorized networks will disallow all external traffic to access
|
664
|
+
# Kubernetes master through HTTPS except traffic from the given CIDR blocks,
|
665
|
+
# Google Compute Engine Public IPs and Google Prod IPs.
|
666
|
+
class MasterAuthorizedNetworksConfig
|
667
|
+
include Google::Apis::Core::Hashable
|
668
|
+
|
669
|
+
# Up to 50 external networks that could access Kubernetes master through HTTPS.
|
670
|
+
# Corresponds to the JSON property `cidrBlocks`
|
671
|
+
# @return [Array<Google::Apis::ComposerV1::CidrBlock>]
|
672
|
+
attr_accessor :cidr_blocks
|
673
|
+
|
674
|
+
# Whether or not master authorized networks feature is enabled.
|
675
|
+
# Corresponds to the JSON property `enabled`
|
676
|
+
# @return [Boolean]
|
677
|
+
attr_accessor :enabled
|
678
|
+
alias_method :enabled?, :enabled
|
679
|
+
|
680
|
+
def initialize(**args)
|
681
|
+
update!(**args)
|
682
|
+
end
|
683
|
+
|
684
|
+
# Update properties of this object
|
685
|
+
def update!(**args)
|
686
|
+
@cidr_blocks = args[:cidr_blocks] if args.key?(:cidr_blocks)
|
687
|
+
@enabled = args[:enabled] if args.key?(:enabled)
|
688
|
+
end
|
689
|
+
end
|
690
|
+
|
630
691
|
# The configuration information for the Kubernetes Engine nodes running the
|
631
692
|
# Apache Airflow software.
|
632
693
|
class NodeConfig
|
633
694
|
include Google::Apis::Core::Hashable
|
634
695
|
|
635
|
-
# Optional. The disk size in GB used for node VMs. Minimum size is
|
696
|
+
# Optional. The disk size in GB used for node VMs. Minimum size is 30GB. If
|
636
697
|
# unspecified, defaults to 100GB. Cannot be updated. This field is supported for
|
637
698
|
# Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*.
|
638
699
|
# Corresponds to the JSON property `diskSizeGb`
|
@@ -940,6 +1001,14 @@ module Google
|
|
940
1001
|
attr_accessor :enable_private_environment
|
941
1002
|
alias_method :enable_private_environment?, :enable_private_environment
|
942
1003
|
|
1004
|
+
# Optional. When enabled, IPs from public (non-RFC1918) ranges can be used for `
|
1005
|
+
# IPAllocationPolicy.cluster_ipv4_cidr_block` and `IPAllocationPolicy.
|
1006
|
+
# service_ipv4_cidr_block`.
|
1007
|
+
# Corresponds to the JSON property `enablePrivatelyUsedPublicIps`
|
1008
|
+
# @return [Boolean]
|
1009
|
+
attr_accessor :enable_privately_used_public_ips
|
1010
|
+
alias_method :enable_privately_used_public_ips?, :enable_privately_used_public_ips
|
1011
|
+
|
943
1012
|
# Configuration options for the private GKE cluster in a Cloud Composer
|
944
1013
|
# environment.
|
945
1014
|
# Corresponds to the JSON property `privateClusterConfig`
|
@@ -972,6 +1041,7 @@ module Google
|
|
972
1041
|
@cloud_composer_network_ipv4_reserved_range = args[:cloud_composer_network_ipv4_reserved_range] if args.key?(:cloud_composer_network_ipv4_reserved_range)
|
973
1042
|
@cloud_sql_ipv4_cidr_block = args[:cloud_sql_ipv4_cidr_block] if args.key?(:cloud_sql_ipv4_cidr_block)
|
974
1043
|
@enable_private_environment = args[:enable_private_environment] if args.key?(:enable_private_environment)
|
1044
|
+
@enable_privately_used_public_ips = args[:enable_privately_used_public_ips] if args.key?(:enable_privately_used_public_ips)
|
975
1045
|
@private_cluster_config = args[:private_cluster_config] if args.key?(:private_cluster_config)
|
976
1046
|
@web_server_ipv4_cidr_block = args[:web_server_ipv4_cidr_block] if args.key?(:web_server_ipv4_cidr_block)
|
977
1047
|
@web_server_ipv4_reserved_range = args[:web_server_ipv4_reserved_range] if args.key?(:web_server_ipv4_reserved_range)
|
@@ -1050,18 +1120,22 @@ module Google
|
|
1050
1120
|
|
1051
1121
|
# The version of the software running in the environment. This encapsulates both
|
1052
1122
|
# the version of Cloud Composer functionality and the version of Apache Airflow.
|
1053
|
-
# It must match the regular expression `composer-([0-9]
|
1054
|
-
# airflow-[0-9]
|
1055
|
-
# checks if the provided version is supported and
|
1056
|
-
# unsupported version. The Cloud Composer portion of
|
1057
|
-
# version](https://semver.org) or
|
1058
|
-
# the
|
1059
|
-
# provided
|
1060
|
-
#
|
1061
|
-
#
|
1062
|
-
#
|
1063
|
-
#
|
1064
|
-
#
|
1123
|
+
# It must match the regular expression `composer-([0-9]+(\.[0-9]+\.[0-9]+(-
|
1124
|
+
# preview\.[0-9]+)?)?|latest)-airflow-([0-9]+(\.[0-9]+(\.[0-9]+)?)?)`. When used
|
1125
|
+
# as input, the server also checks if the provided version is supported and
|
1126
|
+
# denies the request for an unsupported version. The Cloud Composer portion of
|
1127
|
+
# the image version is a full [semantic version](https://semver.org), or an
|
1128
|
+
# alias in the form of major version number or `latest`. When an alias is
|
1129
|
+
# provided, the server replaces it with the current Cloud Composer version that
|
1130
|
+
# satisfies the alias. The Apache Airflow portion of the image version is a full
|
1131
|
+
# semantic version that points to one of the supported Apache Airflow versions,
|
1132
|
+
# or an alias in the form of only major or major.minor versions specified. When
|
1133
|
+
# an alias is provided, the server replaces it with the latest Apache Airflow
|
1134
|
+
# version that satisfies the alias and is supported in the given Cloud Composer
|
1135
|
+
# version. In all cases, the resolved image version is stored in the same field.
|
1136
|
+
# See also [version list](/composer/docs/concepts/versioning/composer-versions)
|
1137
|
+
# and [versioning overview](/composer/docs/concepts/versioning/composer-
|
1138
|
+
# versioning-overview).
|
1065
1139
|
# Corresponds to the JSON property `imageVersion`
|
1066
1140
|
# @return [String]
|
1067
1141
|
attr_accessor :image_version
|
@@ -16,13 +16,13 @@ module Google
|
|
16
16
|
module Apis
|
17
17
|
module ComposerV1
|
18
18
|
# Version of the google-apis-composer_v1 gem
|
19
|
-
GEM_VERSION = "0.
|
19
|
+
GEM_VERSION = "0.23.0"
|
20
20
|
|
21
21
|
# Version of the code generator used to generate this client
|
22
22
|
GENERATOR_VERSION = "0.4.1"
|
23
23
|
|
24
24
|
# Revision of the discovery document this client was generated from
|
25
|
-
REVISION = "
|
25
|
+
REVISION = "20220512"
|
26
26
|
end
|
27
27
|
end
|
28
28
|
end
|
@@ -34,6 +34,12 @@ module Google
|
|
34
34
|
include Google::Apis::Core::JsonObjectSupport
|
35
35
|
end
|
36
36
|
|
37
|
+
class CidrBlock
|
38
|
+
class Representation < Google::Apis::Core::JsonRepresentation; end
|
39
|
+
|
40
|
+
include Google::Apis::Core::JsonObjectSupport
|
41
|
+
end
|
42
|
+
|
37
43
|
class DatabaseConfig
|
38
44
|
class Representation < Google::Apis::Core::JsonRepresentation; end
|
39
45
|
|
@@ -106,6 +112,12 @@ module Google
|
|
106
112
|
include Google::Apis::Core::JsonObjectSupport
|
107
113
|
end
|
108
114
|
|
115
|
+
class MasterAuthorizedNetworksConfig
|
116
|
+
class Representation < Google::Apis::Core::JsonRepresentation; end
|
117
|
+
|
118
|
+
include Google::Apis::Core::JsonObjectSupport
|
119
|
+
end
|
120
|
+
|
109
121
|
class NodeConfig
|
110
122
|
class Representation < Google::Apis::Core::JsonRepresentation; end
|
111
123
|
|
@@ -203,6 +215,14 @@ module Google
|
|
203
215
|
end
|
204
216
|
end
|
205
217
|
|
218
|
+
class CidrBlock
|
219
|
+
# @private
|
220
|
+
class Representation < Google::Apis::Core::JsonRepresentation
|
221
|
+
property :cidr_block, as: 'cidrBlock'
|
222
|
+
property :display_name, as: 'displayName'
|
223
|
+
end
|
224
|
+
end
|
225
|
+
|
206
226
|
class DatabaseConfig
|
207
227
|
# @private
|
208
228
|
class Representation < Google::Apis::Core::JsonRepresentation
|
@@ -259,6 +279,8 @@ module Google
|
|
259
279
|
property :gke_cluster, as: 'gkeCluster'
|
260
280
|
property :maintenance_window, as: 'maintenanceWindow', class: Google::Apis::ComposerV1::MaintenanceWindow, decorator: Google::Apis::ComposerV1::MaintenanceWindow::Representation
|
261
281
|
|
282
|
+
property :master_authorized_networks_config, as: 'masterAuthorizedNetworksConfig', class: Google::Apis::ComposerV1::MasterAuthorizedNetworksConfig, decorator: Google::Apis::ComposerV1::MasterAuthorizedNetworksConfig::Representation
|
283
|
+
|
262
284
|
property :node_config, as: 'nodeConfig', class: Google::Apis::ComposerV1::NodeConfig, decorator: Google::Apis::ComposerV1::NodeConfig::Representation
|
263
285
|
|
264
286
|
property :node_count, as: 'nodeCount'
|
@@ -335,6 +357,15 @@ module Google
|
|
335
357
|
end
|
336
358
|
end
|
337
359
|
|
360
|
+
class MasterAuthorizedNetworksConfig
|
361
|
+
# @private
|
362
|
+
class Representation < Google::Apis::Core::JsonRepresentation
|
363
|
+
collection :cidr_blocks, as: 'cidrBlocks', class: Google::Apis::ComposerV1::CidrBlock, decorator: Google::Apis::ComposerV1::CidrBlock::Representation
|
364
|
+
|
365
|
+
property :enabled, as: 'enabled'
|
366
|
+
end
|
367
|
+
end
|
368
|
+
|
338
369
|
class NodeConfig
|
339
370
|
# @private
|
340
371
|
class Representation < Google::Apis::Core::JsonRepresentation
|
@@ -392,6 +423,7 @@ module Google
|
|
392
423
|
property :cloud_composer_network_ipv4_reserved_range, as: 'cloudComposerNetworkIpv4ReservedRange'
|
393
424
|
property :cloud_sql_ipv4_cidr_block, as: 'cloudSqlIpv4CidrBlock'
|
394
425
|
property :enable_private_environment, as: 'enablePrivateEnvironment'
|
426
|
+
property :enable_privately_used_public_ips, as: 'enablePrivatelyUsedPublicIps'
|
395
427
|
property :private_cluster_config, as: 'privateClusterConfig', class: Google::Apis::ComposerV1::PrivateClusterConfig, decorator: Google::Apis::ComposerV1::PrivateClusterConfig::Representation
|
396
428
|
|
397
429
|
property :web_server_ipv4_cidr_block, as: 'webServerIpv4CidrBlock'
|
@@ -232,15 +232,8 @@ module Google
|
|
232
232
|
# field. Supported for Cloud Composer environments in versions composer-1.*.*-
|
233
233
|
# airflow-*.*.*. * `config.webServerNetworkAccessControl` * Replace the
|
234
234
|
# environment's current `WebServerNetworkAccessControl`. * `config.
|
235
|
-
#
|
236
|
-
#
|
237
|
-
# db-n1-standard-16. Supported for Cloud Composer environments in versions
|
238
|
-
# composer-1.*.*-airflow-*.*.*. * `config.webServerConfig.machineType` * Machine
|
239
|
-
# type on which Airflow web server is running. It has to be one of: composer-n1-
|
240
|
-
# webserver-2, composer-n1-webserver-4 or composer-n1-webserver-8. Supported for
|
241
|
-
# Cloud Composer environments in versions composer-1.*.*-airflow-*.*.*. * `
|
242
|
-
# config.softwareConfig.airflowConfigOverrides` * Replace all Apache Airflow
|
243
|
-
# config overrides. If a replacement config overrides map is not included in `
|
235
|
+
# softwareConfig.airflowConfigOverrides` * Replace all Apache Airflow config
|
236
|
+
# overrides. If a replacement config overrides map is not included in `
|
244
237
|
# environment`, all config overrides are cleared. It is an error to provide both
|
245
238
|
# this mask and a mask specifying one or more individual config overrides. * `
|
246
239
|
# config.softwareConfig.airflowConfigOverrides.`section-name * Override the
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: google-apis-composer_v1
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.23.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Google LLC
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2022-
|
11
|
+
date: 2022-05-23 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: google-apis-core
|
@@ -58,7 +58,7 @@ licenses:
|
|
58
58
|
metadata:
|
59
59
|
bug_tracker_uri: https://github.com/googleapis/google-api-ruby-client/issues
|
60
60
|
changelog_uri: https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-composer_v1/CHANGELOG.md
|
61
|
-
documentation_uri: https://googleapis.dev/ruby/google-apis-composer_v1/v0.
|
61
|
+
documentation_uri: https://googleapis.dev/ruby/google-apis-composer_v1/v0.23.0
|
62
62
|
source_code_uri: https://github.com/googleapis/google-api-ruby-client/tree/main/generated/google-apis-composer_v1
|
63
63
|
post_install_message:
|
64
64
|
rdoc_options: []
|