EBS-1070 Fix delphix#427 VSDK fix required to handle empty system pas…

…sword during Lua to VSDK upgrade
Balamuruhan · Apr 1, 2022 · def4191 · def4191
1 parent f2b9957
commit def4191
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 9 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -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+))?

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -18,7 +18,7 @@ jobs:
  uses: actions/checkout@v1
 
  - name: Set up Python ${{ matrix.python-version }}
- uses: actions/setup-python@v1
+ uses: actions/setup-python@v3
  with:
  python-version: ${{ matrix.python-version }}
 

diff --git a/common/src/main/python/dlpx/virtualization/common/VERSION b/common/src/main/python/dlpx/virtualization/common/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/dvp/src/main/python/dlpx/virtualization/VERSION b/dvp/src/main/python/dlpx/virtualization/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/libs/src/main/python/dlpx/virtualization/libs/VERSION b/libs/src/main/python/dlpx/virtualization/libs/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/libs/src/main/python/dlpx/virtualization/libs/libs.py b/libs/src/main/python/dlpx/virtualization/libs/libs.py
@@ -468,7 +468,17 @@ 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(

diff --git a/platform/src/main/python/dlpx/virtualization/platform/VERSION b/platform/src/main/python/dlpx/virtualization/platform/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/tools/src/main/python/dlpx/virtualization/_internal/VERSION b/tools/src/main/python/dlpx/virtualization/_internal/VERSION
@@ -1 +1 @@
-4.0.2
+4.0.3
diff --git a/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py b/tools/src/test/python/dlpx/virtualization/_internal/test_package_util.py
@@ -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():