diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index d1d7ea0e1..9182c1934 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -30,6 +30,7 @@ jobs: outputs: pr_info: ${{ steps.pr.outputs.result }} runs-on: ubuntu-latest + if: ${{ github.event.workflow_run.conclusion == 'success' }} steps: - name: 'Download Artifact' uses: actions/github-script@v6 diff --git a/environment.yml b/environment.yml index 5fd85d959..87480d55c 100644 --- a/environment.yml +++ b/environment.yml @@ -61,15 +61,15 @@ dependencies: - strawberry-graphql[fastapi,pydantic]==0.194.4 - web3==6.5.0 - twine==4.0.2 + - delta-sharing-python==0.7.4 + - polars==0.18.8 + - moto[s3]==4.1.14 - pip: - dependency-injector==4.41.0 - azure-functions==1.15.0 - nest_asyncio==1.5.6 - hvac==1.1.1 - langchain==0.0.247 - - deltalake==0.10.0 - - moto[s3]==4.1.13 - build==0.10.0 - - polars==0.18.8 - - delta-sharing==0.7.3 + - deltalake==0.10.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 1e060b0ff..e25275cf4 100644 --- a/setup.py +++ b/setup.py @@ -58,7 +58,8 @@ "hvac==1.1.1", "azure-keyvault-secrets==4.7.0", "web3==6.5.0", - "polars==0.18.8" + "polars[deltalake]==0.18.8", + "delta-sharing==0.7.4" ] EXTRAS_DEPENDENCIES: dict[str, list[str]] = { diff --git a/src/sdk/python/rtdip_sdk/pipelines/secrets/azure_key_vault.py b/src/sdk/python/rtdip_sdk/pipelines/secrets/azure_key_vault.py index ae74fcdc5..c4774de20 100644 --- a/src/sdk/python/rtdip_sdk/pipelines/secrets/azure_key_vault.py +++ b/src/sdk/python/rtdip_sdk/pipelines/secrets/azure_key_vault.py @@ -61,7 +61,7 @@ def settings() -> dict: def _get_akv_client(self): return SecretClient( - vault_url=self.vault, + vault_url="https://{}.vault.azure.net".format(self.vault), credential=self.credential, **self.kwargs ) @@ -71,7 +71,7 @@ def get(self): Retrieves the secret from the Azure Key Vault ''' response = self.client.get_secret(name=self.key) - return response + return response.value def set(self): ''' diff --git a/src/sdk/python/rtdip_sdk/pipelines/utilities/pipeline_components.py b/src/sdk/python/rtdip_sdk/pipelines/utilities/pipeline_components.py index 0b9ec2079..c1e874f04 100644 --- a/src/sdk/python/rtdip_sdk/pipelines/utilities/pipeline_components.py +++ b/src/sdk/python/rtdip_sdk/pipelines/utilities/pipeline_components.py @@ -73,7 +73,6 @@ def execute(self) -> Tuple[Libraries, dict]: (issubclass(class_check, UtilitiesInterface) and class_check != UtilitiesInterface) ): component_list.append(cls[1]) - print(cls[0]) task_libraries = Libraries() task_libraries.get_libraries_from_components(component_list) diff --git a/tests/sdk/python/rtdip_sdk/pipelines/secrets/test_azure_key_vault_secrets.py b/tests/sdk/python/rtdip_sdk/pipelines/secrets/test_azure_key_vault_secrets.py index 35bc1c929..2fb116a53 100644 --- a/tests/sdk/python/rtdip_sdk/pipelines/secrets/test_azure_key_vault_secrets.py +++ b/tests/sdk/python/rtdip_sdk/pipelines/secrets/test_azure_key_vault_secrets.py @@ -18,6 +18,9 @@ from src.sdk.python.rtdip_sdk.pipelines.secrets.azure_key_vault import AzureKeyVaultSecrets from src.sdk.python.rtdip_sdk.pipelines._pipeline_utils.models import Libraries, PyPiLibrary +class MockSecretValue(): + value = "test" + def test_azure_key_vault_secret_setup(mocker: MockerFixture): azure_key_vault = AzureKeyVaultSecrets(vault="akv-vault-url", credential=object(), key="test") assert azure_key_vault.system_type().value == 1 @@ -29,7 +32,7 @@ def test_azure_key_vault_secret_setup(mocker: MockerFixture): assert isinstance(azure_key_vault.settings(), dict) def test_azure_key_vault_secrets_get(mocker: MockerFixture): - mocker.patch("azure.keyvault.secrets.SecretClient.get_secret", return_value="test") + mocker.patch("azure.keyvault.secrets.SecretClient.get_secret", return_value=MockSecretValue()) azure_key_vault = AzureKeyVaultSecrets(vault="akv-vault-url", credential=object(), key="vault-key")