Skip to content

Commit

Permalink
EBS-1070 Fix delphix#427 VSDK fix required to handle empty system pas…
Browse files Browse the repository at this point in the history
…sword during Lua to VSDK upgrade
  • Loading branch information
Balamuruhan committed Mar 18, 2022
1 parent f2b9957 commit 3845bfa
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 4.0.2
current_version = 4.0.3
commit = False
tag = False
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\.(?P<release>[a-z]+)(?P<dev>\d+))?
Expand Down
2 changes: 1 addition & 1 deletion common/src/main/python/dlpx/virtualization/common/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
2 changes: 1 addition & 1 deletion dvp/src/main/python/dlpx/virtualization/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
2 changes: 1 addition & 1 deletion libs/src/main/python/dlpx/virtualization/libs/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
10 changes: 9 additions & 1 deletion libs/src/main/python/dlpx/virtualization/libs/libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,15 @@ def retrieve_credentials(credentials_supplier):
response = internal_libs.retrieve_credentials(credentials_request)
response_to_str(response)
credentials_result = _handle_response(response)
if credentials_result.password != "":
# As protobuf definition of credentials_result object has all the
# attributes private_key, public_key and password irrespective of
# whether it is a keypair or a password credential type, we consider the
# object to be password credential type if private_key and public_key is
# not set.
if (
not credentials_result.key_pair.private_key and
not credentials_result.key_pair.public_key
):
return PasswordCredentials(
credentials_result.username, credentials_result.password)
return KeyPairCredentials(
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.2
4.0.3
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
class TestPackageUtil:
@staticmethod
def test_get_version():
assert package_util.get_version() == '4.0.2'
assert package_util.get_version() == '4.0.3'

@staticmethod
def test_get_virtualization_api_version():
Expand Down

0 comments on commit 3845bfa

Please sign in to comment.