Renamed library from infisicalpy to infisical

Astropilot · Astropilot · commit 1cefa5307fc9 · 2023-03-20T23:51:52.000+01:00
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 Start by cloning the repository:
 ```console
-$ git clone https://github.com/Astropilot/infisicalpy
-$ cd infisicalpy
+$ git clone https://github.com/Infisical/infisical-python
+$ cd infisical-python
 ```
 
 We recommand that you create a virtual environment:
diff --git a/README.md b/README.md
@@ -15,11 +15,11 @@
 <a href="https://coverage-badge.samuelcolvin.workers.dev/redirect/Astropilot/infisical-python" target="_blank">
     <img src="https://coverage-badge.samuelcolvin.workers.dev/Astropilot/infisical-python.svg" alt="Coverage">
 </a>
-<a href="https://pypi.org/project/infisicalpy" target="_blank">
-    <img src="https://img.shields.io/pypi/v/infisicalpy?color=%2334D058&label=pypi%20package" alt="Package version">
+<a href="https://pypi.org/project/infisical" target="_blank">
+    <img src="https://img.shields.io/pypi/v/infisical?color=%2334D058&label=pypi%20package" alt="Package version">
 </a>
-<a href="https://pypi.org/project/infisicalpy" target="_blank">
-    <img src="https://img.shields.io/pypi/pyversions/infisicalpy.svg?color=%2334D058" alt="Supported Python versions">
+<a href="https://pypi.org/project/infisical" target="_blank">
+    <img src="https://img.shields.io/pypi/pyversions/infisical.svg?color=%2334D058" alt="Supported Python versions">
 </a>
 <a href="https://github.com/Astropilot/infisical-python/blob/master/LICENSE">
     <img src="https://img.shields.io/github/license/Astropilot/infisical-python" alt="MIT License">
@@ -28,14 +28,14 @@
 
 ## Links
 
-- [SDK docs](https://infisical.com/docs/sdk/overview/usage)
+- [SDK docs](https://infisical.com/docs/sdks/languages/python)
 
 ## Installation
 
 You need Python 3.7+.
 
 ```console
-$ pip install infisicalpy
+$ pip install infisical
 ```
 
 ## Initialization
@@ -45,9 +45,9 @@ If your app only needs to connect to one Infisical project, you should use `infi
 Both `connect` and `createConnection` take a parameter `token` and pull in the secrets accessible by that Infisical token.
 
 ```py
-import infisicalpy
+import infisical
 
-infisicalpy.connect("your_infisical_token")
+infisical.connect("your_infisical_token")
 ```
 
 ### Options
@@ -60,7 +60,7 @@ infisicalpy.connect("your_infisical_token")
 ## Access a Secret Value
 
 ```py
-db_url = infisicalpy.get("DB_URL")
+db_url = infisical.get("DB_URL")
 ```
 
 ## Contributing
@@ -69,4 +69,4 @@ See [Contributing documentation](./.github/CONTRIBUTING.md)
 
 ## License
 
-`infisicalpy` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
+`infisical-python` is distributed under the terms of the [MIT](https://spdx.org/licenses/MIT.html) license.
diff --git a/infisical/__init__.py b/infisical/__init__.py
@@ -1,6 +1,6 @@
 from typing import Optional
 
-from infisicalpy.constants import INFISICAL_URL
+from infisical.constants import INFISICAL_URL
 
 from .client.infisicalclient import InfisicalClient as InfisicalClient
 
diff --git a/infisical/__version__.py b/infisical/__version__.py
diff --git a/infisical/api/__init__.py b/infisical/api/__init__.py
@@ -1,5 +1,5 @@
-from infisicalpy.__version__ import __version__
-from infisicalpy.utils.http import BaseUrlSession, get_http_client
+from infisical.__version__ import __version__
+from infisical.utils.http import BaseUrlSession, get_http_client
 
 USER_AGENT = f"InfisicalPythonSDK/{__version__}"
 
diff --git a/infisical/api/get_secrets.py b/infisical/api/get_secrets.py
@@ -1,4 +1,4 @@
-from infisicalpy.api.models import GetEncryptedSecretsV2Response
+from infisical.api.models import GetEncryptedSecretsV2Response
 from requests import Session
 
 
diff --git a/infisical/api/get_service_token_data.py b/infisical/api/get_service_token_data.py
@@ -1,4 +1,4 @@
-from infisicalpy.api.models import GetServiceTokenDetailsResponse
+from infisical.api.models import GetServiceTokenDetailsResponse
 from requests import Session
 
 
diff --git a/infisical/api/models.py b/infisical/api/models.py
diff --git a/infisical/client/__init__.py b/infisical/client/__init__.py
diff --git a/infisical/client/infisicalclient.py b/infisical/client/infisicalclient.py
@@ -1,11 +1,11 @@
 import os
 from typing import Dict, Optional
 
-from infisicalpy.api import create_api_request_with_auth
-from infisicalpy.constants import INFISICAL_URL, SERVICE_TOKEN_REGEX
-from infisicalpy.exceptions import InfisicalTokenError
-from infisicalpy.logger import logger
-from infisicalpy.services.secret_service import SecretService
+from infisical.api import create_api_request_with_auth
+from infisical.constants import INFISICAL_URL, SERVICE_TOKEN_REGEX
+from infisical.exceptions import InfisicalTokenError
+from infisical.logger import logger
+from infisical.services.secret_service import SecretService
 
 
 class InfisicalClient:
diff --git a/infisical/constants.py b/infisical/constants.py
diff --git a/infisical/exceptions/__init__.py b/infisical/exceptions/__init__.py
diff --git a/infisical/logger.py b/infisical/logger.py
@@ -0,0 +1,3 @@
+import logging
+
+logger = logging.getLogger("infisical")
diff --git a/infisical/models.py b/infisical/models.py
diff --git a/infisical/services/__init__.py b/infisical/services/__init__.py
diff --git a/infisical/services/key_service.py b/infisical/services/key_service.py
@@ -1,8 +1,8 @@
 from typing import List, Union
 
-from infisicalpy.api.models import GetEncryptedSecretsV2SecretResponse
-from infisicalpy.models import InfisicalSecret
-from infisicalpy.utils.crypto import Base64String, Buffer, decrypt_symmetric
+from infisical.api.models import GetEncryptedSecretsV2SecretResponse
+from infisical.models import InfisicalSecret
+from infisical.utils.crypto import Base64String, Buffer, decrypt_symmetric
 
 
 class KeyService:
diff --git a/infisical/services/secret_service.py b/infisical/services/secret_service.py
@@ -1,11 +1,11 @@
 from typing import List, Tuple, Union
 
-from infisicalpy.api.get_secrets import get_secrets
-from infisicalpy.api.get_service_token_data import get_service_token_data
-from infisicalpy.api.models import GetServiceTokenDetailsResponse
-from infisicalpy.models import InfisicalSecret
-from infisicalpy.services.key_service import KeyService
-from infisicalpy.utils.crypto import Base64String, Buffer, decrypt_symmetric
+from infisical.api.get_secrets import get_secrets
+from infisical.api.get_service_token_data import get_service_token_data
+from infisical.api.models import GetServiceTokenDetailsResponse
+from infisical.models import InfisicalSecret
+from infisical.services.key_service import KeyService
+from infisical.utils.crypto import Base64String, Buffer, decrypt_symmetric
 from requests import Session
 
 
diff --git a/infisical/utils/__init__.py b/infisical/utils/__init__.py
diff --git a/infisical/utils/crypto.py b/infisical/utils/crypto.py
diff --git a/infisical/utils/http.py b/infisical/utils/http.py
diff --git a/infisicalpy/logger.py b/infisicalpy/logger.py
diff --git a/pyproject.toml b/pyproject.toml
@@ -3,12 +3,13 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-name = "infisicalpy"
+name = "infisical"
 description = 'Official Infisical SDK for Python'
 readme = "README.md"
 requires-python = ">=3.7"
 license = "MIT"
-authors = [
+authors = []
+maintainers = [
   { name = "Yohann MARTIN", email = "contact@codexus.fr" },
 ]
 classifiers = [
@@ -60,7 +61,7 @@ dev = [
 ]
 
 [tool.hatch.version]
-path = "infisicalpy/__version__.py"
+path = "infisical/__version__.py"
 
 [tool.hatch.build.targets.sdist]
 exclude = [
@@ -70,7 +71,7 @@ exclude = [
 
 [tool.isort]
 profile = "black"
-known_third_party = ["infisicalpy", "pydantic", "Cryptodome", "nacl", "responses"]
+known_third_party = ["infisical", "pydantic", "Cryptodome", "nacl", "responses"]
 
 [tool.mypy]
 strict = true
@@ -79,7 +80,7 @@ strict = true
 parallel = true
 source = [
     "tests",
-    "infisicalpy"
+    "infisical"
 ]
 
 [tool.coverage.report]
@@ -109,4 +110,4 @@ ignore = [
 "__init__.py" = ["F401"]
 
 [tool.ruff.isort]
-known-third-party = ["infisicalpy"]
+known-third-party = ["infisical"]
diff --git a/scripts/format.sh b/scripts/format.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -e
 set -x
 
-ruff check infisicalpy tests --fix
-black infisicalpy tests
-isort infisicalpy tests
+ruff check infisical tests --fix
+black infisical tests
+isort infisical tests
diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-mypy infisicalpy
-ruff check infisicalpy tests
-black infisicalpy tests --check
-isort infisicalpy tests --check-only
+mypy infisical
+ruff check infisical tests
+black infisical tests --check
+isort infisical tests --check-only
diff --git a/tests/test_api/test_api_request.py b/tests/test_api/test_api_request.py
@@ -1,5 +1,5 @@
-from infisicalpy.__version__ import __version__
-from infisicalpy.api import create_api_request_with_auth
+from infisical.__version__ import __version__
+from infisical.api import create_api_request_with_auth
 
 from tests.data.service_token import BEARER_TOKEN
 
diff --git a/tests/test_api/test_get_secrets.py b/tests/test_api/test_get_secrets.py
@@ -1,6 +1,6 @@
 import responses
-from infisicalpy.api import create_api_request_with_auth
-from infisicalpy.api.get_secrets import get_secrets
+from infisical.api import create_api_request_with_auth
+from infisical.api.get_secrets import get_secrets
 
 from tests.data.secrets_reponse import GET_SECRETS_RESPONSE
 from tests.data.service_token import BEARER_TOKEN
diff --git a/tests/test_api/test_get_service_token_data.py b/tests/test_api/test_get_service_token_data.py
@@ -1,6 +1,6 @@
 import responses
-from infisicalpy.api import create_api_request_with_auth
-from infisicalpy.api.get_service_token_data import get_service_token_data
+from infisical.api import create_api_request_with_auth
+from infisical.api.get_service_token_data import get_service_token_data
 
 from tests.data.service_token import BEARER_TOKEN, GET_SERVICE_TOKEN_RESPONSE
 
diff --git a/tests/test_client/test_infisical_client.py b/tests/test_client/test_infisical_client.py
@@ -1,7 +1,7 @@
 import pytest
 import responses
-from infisicalpy import InfisicalClient
-from infisicalpy.exceptions import InfisicalTokenError
+from infisical import InfisicalClient
+from infisical.exceptions import InfisicalTokenError
 
 from tests.data.secrets_reponse import GET_SECRETS_RESPONSE
 from tests.data.service_token import GET_SERVICE_TOKEN_RESPONSE, SERVICE_TOKEN
diff --git a/tests/test_services/test_key_service.py b/tests/test_services/test_key_service.py
@@ -1,5 +1,5 @@
-from infisicalpy.api.models import GetEncryptedSecretsV2Response
-from infisicalpy.services.key_service import KeyService
+from infisical.api.models import GetEncryptedSecretsV2Response
+from infisical.services.key_service import KeyService
 
 from tests.data.secrets_reponse import JSON_SECRETS_ENCRYPTED
 
diff --git a/tests/test_services/test_secret_service.py b/tests/test_services/test_secret_service.py
@@ -1,6 +1,6 @@
 import responses
-from infisicalpy.api import create_api_request_with_auth
-from infisicalpy.services.secret_service import SecretService
+from infisical.api import create_api_request_with_auth
+from infisical.services.secret_service import SecretService
 
 from tests.data.secrets_reponse import GET_SECRETS_RESPONSE
 from tests.data.service_token import BEARER_TOKEN, GET_SERVICE_TOKEN_RESPONSE
diff --git a/tests/test_utils/test_crypto_decrypt_asymmetric.py b/tests/test_utils/test_crypto_decrypt_asymmetric.py
@@ -1,5 +1,5 @@
 import pytest
-from infisicalpy.utils.crypto import decrypt_asymmetric
+from infisical.utils.crypto import decrypt_asymmetric
 
 BOB_PRIVATE_KEY = b"rMZ\xd8v\xfc\xdchn_\xb3\xf3\xb6(@\xb5\x15F\xdf\x12\x13\xf6_\x827\xea\x8eBc\x1fQ\x9b"
 BOB_PUBLIC_KEY = (
diff --git a/tests/test_utils/test_crypto_decrypt_symmetric.py b/tests/test_utils/test_crypto_decrypt_symmetric.py
@@ -1,5 +1,5 @@
 import pytest
-from infisicalpy.utils.crypto import decrypt_symmetric
+from infisical.utils.crypto import decrypt_symmetric
 
 
 def test_decrypt_symmetric_base64() -> None:
diff --git a/tests/test_utils/test_crypto_encrypt_asymmetric.py b/tests/test_utils/test_crypto_encrypt_asymmetric.py
@@ -1,5 +1,5 @@
 import pytest
-from infisicalpy.utils.crypto import decrypt_asymmetric, encrypt_asymmetric
+from infisical.utils.crypto import decrypt_asymmetric, encrypt_asymmetric
 
 BOB_PRIVATE_KEY = b"rMZ\xd8v\xfc\xdchn_\xb3\xf3\xb6(@\xb5\x15F\xdf\x12\x13\xf6_\x827\xea\x8eBc\x1fQ\x9b"
 BOB_PUBLIC_KEY = (
diff --git a/tests/test_utils/test_crypto_encrypt_symmetric.py b/tests/test_utils/test_crypto_encrypt_symmetric.py
@@ -1,5 +1,5 @@
 import pytest
-from infisicalpy.utils.crypto import decrypt_symmetric, encrypt_symmetric
+from infisical.utils.crypto import decrypt_symmetric, encrypt_symmetric
 
 
 def test_encrypt_symmetric_base64() -> None:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from infisicalpy.api.models import GetEncryptedSecretsV2Response`
	`1`	`+from infisical.api.models import GetEncryptedSecretsV2Response`
`2`	`2`	`from requests import Session`
`3`	`3`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from infisicalpy.api.models import GetServiceTokenDetailsResponse`
	`1`	`+from infisical.api.models import GetServiceTokenDetailsResponse`
`2`	`2`	`from requests import Session`
`3`	`3`
`4`	`4`