Skip to content

Commit 03bd04f

Browse files
CDP CLI 0.9.102
1 parent 249a564 commit 03bd04f

37 files changed

+762
-65
lines changed

PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: cdpcli
3-
Version: 0.9.101
3+
Version: 0.9.102
44
Summary: Cloudera CDP Command Line Interface
55
Home-page: https://console.cdp.cloudera.com/
66
Author: Cloudera, Inc.

cdpcli.egg-info/PKG-INFO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: cdpcli
3-
Version: 0.9.101
3+
Version: 0.9.102
44
Summary: Cloudera CDP Command Line Interface
55
Home-page: https://console.cdp.cloudera.com/
66
Author: Cloudera, Inc.

cdpcli.egg-info/SOURCES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ cdpcli/extensions/generatecliskeleton.py
8888
cdpcli/extensions/interactivelogin.py
8989
cdpcli/extensions/logout.py
9090
cdpcli/extensions/paginate.py
91+
cdpcli/extensions/pvcapipath.py
9192
cdpcli/extensions/redirect.py
9293
cdpcli/extensions/refdoc.py
9394
cdpcli/extensions/workload.py
@@ -134,6 +135,7 @@ tests/unit/extensions/test_interactivelogin.py
134135
tests/unit/extensions/test_logout.py
135136
tests/unit/extensions/test_operation_extension.py
136137
tests/unit/extensions/test_paginate.py
138+
tests/unit/extensions/test_pvcapipath.py
137139
tests/unit/extensions/test_redirect.py
138140
tests/unit/extensions/test_workload.py
139141
tests/unit/extensions/test_writer.py

cdpcli/_version.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88

99
version_json = '''
1010
{
11-
"date": "2023-11-09T12:37:43-0600",
11+
"date": "2023-12-01T12:52:37-0800",
1212
"dirty": true,
1313
"error": null,
14-
"full-revisionid": "4a46622ff8d757e4bbeaf03860ccb679de57012d",
15-
"version": "0.9.101"
14+
"full-revisionid": "b608e548939880739cca0966282fe7c1976d321c",
15+
"version": "0.9.102"
1616
}
1717
''' # END VERSION_JSON
1818

cdpcli/clidriver.py

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ def _create_command_table(self):
416416
clidriver=self._clidriver,
417417
name=cli_name,
418418
parent_name=self._name,
419+
service_model=service_model,
419420
operation_model=operation_model,
420421
operation_caller=CLIOperationCaller())
421422
register_ext, register_cmd = get_extension_registers(self._name)
@@ -488,7 +489,8 @@ class ServiceOperation(object):
488489
}
489490
DEFAULT_ARG_CLASS = CLIArgument
490491

491-
def __init__(self, clidriver, name, parent_name, operation_caller, operation_model):
492+
def __init__(self, clidriver, name, parent_name, service_model,
493+
operation_model, operation_caller):
492494
self._clidriver = clidriver
493495
self._arg_table = None
494496
self._name = name
@@ -499,6 +501,7 @@ def __init__(self, clidriver, name, parent_name, operation_caller, operation_mod
499501
# order and if any returns 'False' no other callers will be called.
500502
self._operation_callers = [operation_caller]
501503
self._lineage = [self]
504+
self._service_model = service_model
502505
self._operation_model = operation_model
503506
self._UNDOCUMENTED = self._operation_model.is_deprecated
504507

@@ -638,14 +641,20 @@ def _handle_override_required_args(self, args):
638641
self._operation_callers.insert(0, cli_argument)
639642

640643
def _handle_extensions(self):
641-
if self._operation_model.extensions:
644+
# operation level extension configuration overrides service level configuration.
645+
extensions = self._operation_model.extensions
646+
if extensions is None:
647+
extensions = self._service_model.extensions
648+
if extensions:
642649
# Iterate in reversed order to keep the execution order:
643650
# First extension should run first.
644-
for ext_name in reversed(self._operation_model.extensions):
651+
for ext_name in [x for x in reversed(extensions) if x]:
645652
register_ext, register_cmd = get_extension_registers(ext_name)
646653
if register_ext is None:
647654
raise ExtensionImportError(ext_name=ext_name, err='Not Found')
648-
register_ext(self._operation_callers, self._operation_model)
655+
register_ext(self._operation_callers,
656+
self._operation_model,
657+
self._clidriver.get_form_factor())
649658

650659
def _invoke_operation_callers(self,
651660
client_creator,
@@ -699,7 +708,7 @@ class FilteredServiceOperation(ServiceOperation):
699708

700709
def __init__(self, clidriver, name, parent_name, form_factor, operation_form_factors):
701710
super().__init__(clidriver, name, parent_name,
702-
operation_caller=None, operation_model=None)
711+
operation_caller=None, operation_model=None, service_model=None)
703712
self._form_factor = form_factor
704713
self._operation_form_factors = operation_form_factors
705714

cdpcli/data/audit/audit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-products: CDP
55
x-form-factors: public
66
x-cdp-releases: PUBLIC
77
info:
8-
version: 0.9.101
8+
version: 0.9.102
99
title: Cloudera Audit Service
1010
license:
1111
name: Apache 2.0

cdpcli/data/compute/compute.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-products: CDP
55
x-form-factors: public,private
66
x-cdp-releases: PUBLIC
77
info:
8-
version: 0.9.101
8+
version: 0.9.102
99
title: Cloudera Compute Service
1010
license:
1111
name: Apache 2.0
@@ -113,10 +113,11 @@ definitions:
113113
- RKE
114114
ComputeClusterType:
115115
type: string
116-
description: "Object representing compute cluster types.\n `Dedicated` - value representing dedicated compute cluster `Shared` - value representing shared compute cluster"
116+
description: "Object representing compute cluster types.\n `DedicatedExternal` - Value representing an external dedicated compute cluster. `Shared` - Value representing a shared compute cluster. `Dedicated` - Value representing an embedded dedicated compute cluster."
117117
enum:
118-
- Dedicated
118+
- DedicatedExternal
119119
- Shared
120+
- Dedicated
120121
ComputeClusterOwner:
121122
type: object
122123
description: Compute cluster owner structure.

cdpcli/data/consumption/consumption.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-products: CDP
55
x-form-factors: public
66
x-cdp-releases: PUBLIC
77
info:
8-
version: 0.9.101
8+
version: 0.9.102
99
title: Cloudera Consumption API Service
1010
license:
1111
name: Apache 2.0

cdpcli/data/datacatalog/datacatalog.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ x-form-factors: public
55
x-cdp-releases: PUBLIC
66
x-audit: true
77
info:
8-
version: 0.9.101
8+
version: 0.9.102
99
title: Cloudera DataCatalog Service
1010
license:
1111
name: Apache 2.0

cdpcli/data/datahub/datahub.yaml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ x-form-factors: public
66
x-cdp-releases: PUBLIC
77
x-audit: true
88
info:
9-
version: 0.9.101
9+
version: 0.9.102
1010
title: Cloudera Data hub Service
1111
license:
1212
name: Apache 2.0
@@ -1411,6 +1411,10 @@ definitions:
14111411
endpoints:
14121412
$ref: '#/definitions/Endpoints'
14131413
description: The exposed service api endpoints.
1414+
multiAz:
1415+
default: false
1416+
type: boolean
1417+
description: Flag that toggles the multi availability zone for the given datahub cluster when you are not sure what subnet IDs can be used. This way the subnet IDs will be used what the environment suggests.
14141418
ClusterExtension:
14151419
type: object
14161420
description: Cluster extensions for Data Hub cluster.
@@ -1649,6 +1653,9 @@ definitions:
16491653
environmentCrn:
16501654
type: string
16511655
description: The CRN of the environment.
1656+
environmentName:
1657+
type: string
1658+
description: The name of the environment.
16521659
cloudPlatform:
16531660
type: string
16541661
description: The name of the cloud platform.
@@ -2663,6 +2670,10 @@ definitions:
26632670
datahubDatabase:
26642671
$ref: '#/definitions/DatahubDatabaseType'
26652672
description: 'Database type for datahub. Currently supported values: NONE, NON_HA, HA'
2673+
multiAz:
2674+
default: false
2675+
type: boolean
2676+
description: Flag that toggles the multi availability zone feature for the given datahub cluster when unsure what subnet IDs can be used. When true, the subnet IDs suggested by the environment will be used.
26662677
loadBalancerSku:
26672678
description: The SKU for the datahub load balancer. Allowed values are "BASIC", "STANDARD", or "NONE".
26682679
$ref: '#/definitions/DatahubLoadBalancerSkuType'

0 commit comments

Comments
 (0)