Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .librarian/state.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,7 @@ libraries:
tag_format: '{id}-v{version}'
- id: google-cloud-dataproc
version: 5.26.0
last_generated_commit: 1133adb136f742df62864f1d9d307df25d451880
last_generated_commit: 38ed7d6ba66a774924722146f054d12b4487a89f
apis:
- path: google/cloud/dataproc/v1
service_config: dataproc_v1.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,8 @@ class ClusterConfig(proto.Message):
Optional. The type of the cluster.
cluster_tier (google.cloud.dataproc_v1.types.ClusterConfig.ClusterTier):
Optional. The cluster tier.
engine (google.cloud.dataproc_v1.types.ClusterConfig.Engine):
Optional. The cluster engine.
config_bucket (str):
Optional. A Cloud Storage bucket used to stage job
dependencies, config files, and job driver console output.
Expand Down Expand Up @@ -300,6 +302,23 @@ class ClusterTier(proto.Enum):
CLUSTER_TIER_STANDARD = 1
CLUSTER_TIER_PREMIUM = 2

class Engine(proto.Enum):
r"""The cluster engine.

Values:
ENGINE_UNSPECIFIED (0):
The engine is not specified. Works the same as
ENGINE_DEFAULT.
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The docstring for ENGINE_UNSPECIFIED refers to ENGINE_DEFAULT, but the corresponding enum member is named DEFAULT (line 319). This inconsistency in the documentation should be corrected to refer to the actual member name.

Suggested change
ENGINE_DEFAULT.
DEFAULT.

DEFAULT (1):
The cluster is a default engine cluster.
LIGHTNING (2):
The cluster is a lightning engine cluster.
"""

ENGINE_UNSPECIFIED = 0
DEFAULT = 1
LIGHTNING = 2

cluster_type: ClusterType = proto.Field(
proto.ENUM,
number=27,
Expand All @@ -310,6 +329,11 @@ class ClusterTier(proto.Enum):
number=29,
enum=ClusterTier,
)
engine: Engine = proto.Field(
proto.ENUM,
number=30,
enum=Engine,
)
config_bucket: str = proto.Field(
proto.STRING,
number=1,
Expand Down Expand Up @@ -1911,6 +1935,28 @@ class LifecycleConfig(proto.Message):
`Duration <https://developers.google.com/protocol-buffers/docs/proto3#json>`__).

This field is a member of `oneof`_ ``ttl``.
idle_stop_ttl (google.protobuf.duration_pb2.Duration):
Optional. The duration to keep the cluster started while
idling (when no jobs are running). Passing this threshold
will cause the cluster to be stopped. Minimum value is 5
minutes; maximum value is 14 days (see JSON representation
of
`Duration <https://developers.google.com/protocol-buffers/docs/proto3#json>`__).
auto_stop_time (google.protobuf.timestamp_pb2.Timestamp):
Optional. The time when cluster will be auto-stopped (see
JSON representation of
`Timestamp <https://developers.google.com/protocol-buffers/docs/proto3#json>`__).

This field is a member of `oneof`_ ``stop_ttl``.
auto_stop_ttl (google.protobuf.duration_pb2.Duration):
Optional. The lifetime duration of the cluster. The cluster
will be auto-stopped at the end of this period, calculated
from the time of submission of the create or update cluster
request. Minimum value is 10 minutes; maximum value is 14
days (see JSON representation of
`Duration <https://developers.google.com/protocol-buffers/docs/proto3#json>`__).

This field is a member of `oneof`_ ``stop_ttl``.
idle_start_time (google.protobuf.timestamp_pb2.Timestamp):
Output only. The time when cluster became idle (most recent
job finished) and became eligible for deletion due to
Expand All @@ -1935,6 +1981,23 @@ class LifecycleConfig(proto.Message):
oneof="ttl",
message=duration_pb2.Duration,
)
idle_stop_ttl: duration_pb2.Duration = proto.Field(
proto.MESSAGE,
number=5,
message=duration_pb2.Duration,
)
auto_stop_time: timestamp_pb2.Timestamp = proto.Field(
proto.MESSAGE,
number=6,
oneof="stop_ttl",
message=timestamp_pb2.Timestamp,
)
auto_stop_ttl: duration_pb2.Duration = proto.Field(
proto.MESSAGE,
number=7,
oneof="stop_ttl",
message=duration_pb2.Duration,
)
idle_start_time: timestamp_pb2.Timestamp = proto.Field(
proto.MESSAGE,
number=4,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6369,6 +6369,7 @@ def test_create_cluster_rest_call_success(request_type):
"config": {
"cluster_type": 1,
"cluster_tier": 1,
"engine": 1,
"config_bucket": "config_bucket_value",
"temp_bucket": "temp_bucket_value",
"gce_cluster_config": {
Expand Down Expand Up @@ -6495,6 +6496,9 @@ def test_create_cluster_rest_call_success(request_type):
"idle_delete_ttl": {},
"auto_delete_time": {"seconds": 751, "nanos": 543},
"auto_delete_ttl": {},
"idle_stop_ttl": {},
"auto_stop_time": {},
"auto_stop_ttl": {},
"idle_start_time": {},
},
"endpoint_config": {"http_ports": {}, "enable_http_port_access": True},
Expand Down Expand Up @@ -6785,6 +6789,7 @@ def test_update_cluster_rest_call_success(request_type):
"config": {
"cluster_type": 1,
"cluster_tier": 1,
"engine": 1,
"config_bucket": "config_bucket_value",
"temp_bucket": "temp_bucket_value",
"gce_cluster_config": {
Expand Down Expand Up @@ -6911,6 +6916,9 @@ def test_update_cluster_rest_call_success(request_type):
"idle_delete_ttl": {},
"auto_delete_time": {"seconds": 751, "nanos": 543},
"auto_delete_ttl": {},
"idle_stop_ttl": {},
"auto_stop_time": {},
"auto_stop_ttl": {},
"idle_start_time": {},
},
"endpoint_config": {"http_ports": {}, "enable_http_port_access": True},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5994,6 +5994,7 @@ def test_create_workflow_template_rest_call_success(request_type):
"config": {
"cluster_type": 1,
"cluster_tier": 1,
"engine": 1,
"config_bucket": "config_bucket_value",
"temp_bucket": "temp_bucket_value",
"gce_cluster_config": {
Expand Down Expand Up @@ -6127,6 +6128,9 @@ def test_create_workflow_template_rest_call_success(request_type):
"idle_delete_ttl": {},
"auto_delete_time": {},
"auto_delete_ttl": {},
"idle_stop_ttl": {},
"auto_stop_time": {},
"auto_stop_ttl": {},
"idle_start_time": {},
},
"endpoint_config": {
Expand Down Expand Up @@ -6786,6 +6790,7 @@ def test_instantiate_inline_workflow_template_rest_call_success(request_type):
"config": {
"cluster_type": 1,
"cluster_tier": 1,
"engine": 1,
"config_bucket": "config_bucket_value",
"temp_bucket": "temp_bucket_value",
"gce_cluster_config": {
Expand Down Expand Up @@ -6919,6 +6924,9 @@ def test_instantiate_inline_workflow_template_rest_call_success(request_type):
"idle_delete_ttl": {},
"auto_delete_time": {},
"auto_delete_ttl": {},
"idle_stop_ttl": {},
"auto_stop_time": {},
"auto_stop_ttl": {},
"idle_start_time": {},
},
"endpoint_config": {
Expand Down Expand Up @@ -7296,6 +7304,7 @@ def test_update_workflow_template_rest_call_success(request_type):
"config": {
"cluster_type": 1,
"cluster_tier": 1,
"engine": 1,
"config_bucket": "config_bucket_value",
"temp_bucket": "temp_bucket_value",
"gce_cluster_config": {
Expand Down Expand Up @@ -7429,6 +7438,9 @@ def test_update_workflow_template_rest_call_success(request_type):
"idle_delete_ttl": {},
"auto_delete_time": {},
"auto_delete_ttl": {},
"idle_stop_ttl": {},
"auto_stop_time": {},
"auto_stop_ttl": {},
"idle_start_time": {},
},
"endpoint_config": {
Expand Down
Loading