fivetran-cli 0.1.0__tar.gz → 0.1.1__tar.gz

{fivetran_cli-0.1.0/src/fivetran_cli.egg-info → fivetran_cli-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran-cli
-Version: 0.1.0
+Version: 0.1.1
 Summary: Command line wrapper for the Fivetran REST API
 Author: Fivetran
 License-Expression: MIT
@@ -22,10 +22,10 @@ Thin command line wrapper around the Fivetran REST API.
 fivetran [global-options] <resource> <operation> [arguments] [options]
 ```
 
-Credentials default to `FIVETRAN_API_KEY` and `FIVETRAN_API_SECRET`.
+Credentials default to `FIVETRAN_API_KEY`. Set it to the single Base64-encoded API key shown by Fivetran.
 
 ```bash
-fivetran --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET" connection list
+fivetran --api-key "$FIVETRAN_API_KEY" connection list
 fivetran connection create --data-file connection.json
 ```
 
@@ -34,7 +34,7 @@ fivetran connection create --data-file connection.json
 Global options may be placed before or after the resource command.
 
 ```bash
-fivetran connection list --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET"
+fivetran connection list --api-key "$FIVETRAN_API_KEY"
 fivetran connection-schema get connection_id
 fivetran connector-metadata get google_ads
 fivetran public-connector list

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/README.md

@@ -6,10 +6,10 @@ Thin command line wrapper around the Fivetran REST API.
 fivetran [global-options] <resource> <operation> [arguments] [options]
 ```
 
-Credentials default to `FIVETRAN_API_KEY` and `FIVETRAN_API_SECRET`.
+Credentials default to `FIVETRAN_API_KEY`. Set it to the single Base64-encoded API key shown by Fivetran.
 
 ```bash
-fivetran --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET" connection list
+fivetran --api-key "$FIVETRAN_API_KEY" connection list
 fivetran connection create --data-file connection.json
 ```
 
@@ -18,7 +18,7 @@ fivetran connection create --data-file connection.json
 Global options may be placed before or after the resource command.
 
 ```bash
-fivetran connection list --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET"
+fivetran connection list --api-key "$FIVETRAN_API_KEY"
 fivetran connection-schema get connection_id
 fivetran connector-metadata get google_ads
 fivetran public-connector list

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fivetran-cli"
-version = "0.1.0"
+version = "0.1.1"
 description = "Command line wrapper for the Fivetran REST API"
 readme = "README.md"
 requires-python = ">=3.11"

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/src/fivetran_cli/cli.py

@@ -18,7 +18,6 @@ from .output import emit_output
 Handler = Callable[[argparse.Namespace, FivetranClient], Any]
 GLOBAL_OPTIONS_WITH_VALUES = {
     "--api-key",
-    "--api-secret",
     "--profile",
     "--base-url",
     "--format",
@@ -26,7 +25,7 @@ GLOBAL_OPTIONS_WITH_VALUES = {
 }
 GLOBAL_FLAG_OPTIONS = {"--quiet", "--verbose"}
 OPERATION_EPILOG = (
-    "Credentials default to FIVETRAN_API_KEY and FIVETRAN_API_SECRET. "
+    "Credentials default to FIVETRAN_API_KEY, which should contain the Base64-encoded API key. "
     "FIVETRAN_BASE_URL overrides the default API base URL. "
     "Global options may be placed before or after the resource command."
 )
@@ -121,10 +120,9 @@ def build_parser() -> argparse.ArgumentParser:
 
 
 def _add_global_options(parser: argparse.ArgumentParser) -> None:
-    parser.add_argument("--api-key", help="Fivetran API key. Defaults to FIVETRAN_API_KEY.")
     parser.add_argument(
-        "--api-secret",
-        help="Fivetran API secret. Defaults to FIVETRAN_API_SECRET.",
+        "--api-key",
+        help="Base64-encoded Fivetran API key. Defaults to FIVETRAN_API_KEY.",
     )
     parser.add_argument("--profile", help="Named credential profile.")
     parser.add_argument(
@@ -1413,11 +1411,6 @@ def _confirm_destructive(args: argparse.Namespace) -> None:
 def resolve_config(args: argparse.Namespace) -> ClientConfig:
     profile = _load_profile(args.profile) if args.profile else {}
     api_key = args.api_key or profile.get("api_key") or os.environ.get("FIVETRAN_API_KEY")
-    api_secret = (
-        args.api_secret
-        or profile.get("api_secret")
-        or os.environ.get("FIVETRAN_API_SECRET")
-    )
     base_url = (
         args.base_url
         or profile.get("base_url")
@@ -1426,7 +1419,6 @@ def resolve_config(args: argparse.Namespace) -> ClientConfig:
     )
     return ClientConfig(
         api_key=api_key,
-        api_secret=api_secret,
         base_url=base_url,
         verbose=args.verbose,
     )

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/src/fivetran_cli/client.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import base64
 import json
 import urllib.error
 import urllib.parse
@@ -19,7 +18,6 @@ class CliError(Exception):
 @dataclass(frozen=True)
 class ClientConfig:
     api_key: str | None
-    api_secret: str | None
     base_url: str = DEFAULT_BASE_URL
     verbose: bool = False
 
@@ -38,10 +36,10 @@ class FivetranClient:
         body: Any = None,
         auth_required: bool = True,
     ) -> Any:
-        if auth_required and (not self.config.api_key or not self.config.api_secret):
+        if auth_required and not self.config.api_key:
             raise CliError(
-                "Missing Fivetran API credentials. Set FIVETRAN_API_KEY and "
-                "FIVETRAN_API_SECRET, pass --api-key/--api-secret, or use --profile."
+                "Missing Fivetran API key. Set FIVETRAN_API_KEY to the "
+                "Base64-encoded API key, pass --api-key, or use --profile."
             )
 
         url = self._url(path, query)
@@ -52,8 +50,7 @@ class FivetranClient:
             headers["Content-Type"] = "application/json"
 
         if auth_required:
-            token = f"{self.config.api_key}:{self.config.api_secret}".encode("utf-8")
-            headers["Authorization"] = "Basic " + base64.b64encode(token).decode("ascii")
+            headers["Authorization"] = _authorization_header(self.config.api_key)
 
         request = urllib.request.Request(url, data=data, headers=headers, method=method)
 
@@ -157,3 +154,12 @@ def _next_cursor(page: Any) -> str | None:
         cursor = data.get("next_cursor")
         return str(cursor) if cursor else None
     return None
+
+
+def _authorization_header(api_key: str | None) -> str:
+    if api_key is None:
+        raise CliError("Missing Fivetran API key.")
+    api_key = api_key.strip()
+    if api_key.lower().startswith("basic "):
+        return api_key
+    return f"Basic {api_key}"

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1/src/fivetran_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fivetran-cli
-Version: 0.1.0
+Version: 0.1.1
 Summary: Command line wrapper for the Fivetran REST API
 Author: Fivetran
 License-Expression: MIT
@@ -22,10 +22,10 @@ Thin command line wrapper around the Fivetran REST API.
 fivetran [global-options] <resource> <operation> [arguments] [options]
 ```
 
-Credentials default to `FIVETRAN_API_KEY` and `FIVETRAN_API_SECRET`.
+Credentials default to `FIVETRAN_API_KEY`. Set it to the single Base64-encoded API key shown by Fivetran.
 
 ```bash
-fivetran --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET" connection list
+fivetran --api-key "$FIVETRAN_API_KEY" connection list
 fivetran connection create --data-file connection.json
 ```
 
@@ -34,7 +34,7 @@ fivetran connection create --data-file connection.json
 Global options may be placed before or after the resource command.
 
 ```bash
-fivetran connection list --api-key "$FIVETRAN_API_KEY" --api-secret "$FIVETRAN_API_SECRET"
+fivetran connection list --api-key "$FIVETRAN_API_KEY"
 fivetran connection-schema get connection_id
 fivetran connector-metadata get google_ads
 fivetran public-connector list

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/tests/test_cli.py

@@ -51,8 +51,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "connection",
                 "list",
                 "--group-id",
@@ -88,8 +86,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "connection",
                 "create",
                 "--data",
@@ -113,8 +109,6 @@ class CliTests(unittest.TestCase):
                 "connection_id",
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "--format",
                 "table",
             ]
@@ -129,8 +123,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "group",
                 "delete",
                 "group_id",
@@ -146,8 +138,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "group",
                 "delete",
                 "group_id",
@@ -162,7 +152,7 @@ class CliTests(unittest.TestCase):
         with tempfile.TemporaryDirectory() as tmpdir:
             config_path = Path(tmpdir) / "config.toml"
             config_path.write_text(
-                '[profiles.dev]\napi_key = "profile-key"\napi_secret = "profile-secret"\nbase_url = "https://example.test"\n',
+                '[profiles.dev]\napi_key = "profile-key"\nbase_url = "https://example.test"\n',
                 encoding="utf-8",
             )
             with patch.dict(os.environ, {"FIVETRAN_CONFIG": str(config_path)}, clear=False):
@@ -170,7 +160,6 @@ class CliTests(unittest.TestCase):
 
         self.assertEqual(code, 0, stderr)
         self.assertEqual(client.config.api_key, "profile-key")
-        self.assertEqual(client.config.api_secret, "profile-secret")
         self.assertEqual(client.config.base_url, "https://example.test")
         self.assertEqual(client.calls[0][0:2], ("GET", "/v1/account/info"))
 
@@ -179,8 +168,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "user",
                 "connection",
                 "update",
@@ -208,8 +195,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "team",
                 "connection",
                 "add",
@@ -228,8 +213,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "system-key",
                 "rotate",
                 "key_id",
@@ -245,8 +228,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "group",
                 "public-key",
                 "get",
@@ -262,8 +243,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "--output",
                 "/missing-directory/output.json",
                 "account",
@@ -280,8 +259,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "connection-schema",
                 "column",
                 "drop-blocked",
@@ -309,8 +286,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "connection-schema",
                 "column",
                 "update",
@@ -337,8 +312,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "connector-metadata",
                 "get",
                 "google_ads",
@@ -360,8 +333,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "hybrid-deployment-agent",
                 "list",
                 "--group-id",
@@ -388,8 +359,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "proxy-agent",
                 "connection",
                 "list",
@@ -405,8 +374,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "private-link",
                 "update",
                 "private_link_id",
@@ -424,8 +391,6 @@ class CliTests(unittest.TestCase):
             [
                 "--api-key",
                 "key",
-                "--api-secret",
-                "secret",
                 "transformation",
                 "list",
                 "--all",

{fivetran_cli-0.1.0 → fivetran_cli-0.1.1}/tests/test_client.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 import unittest
+from unittest.mock import MagicMock, patch
 
 from fivetran_cli.client import CliError, ClientConfig, FivetranClient
 
 
 class PagingClient(FivetranClient):
     def __init__(self) -> None:
-        super().__init__(ClientConfig(api_key="key", api_secret="secret"))
+        super().__init__(ClientConfig(api_key="encoded-key"))
         self.calls = []
 
     def request(self, method, path, *, query=None, body=None, auth_required=True):
@@ -37,16 +38,44 @@ class ClientTests(unittest.TestCase):
         )
 
     def test_request_requires_credentials_for_authenticated_endpoints(self):
-        client = FivetranClient(ClientConfig(api_key=None, api_secret=None))
+        client = FivetranClient(ClientConfig(api_key=None))
 
         with self.assertRaises(CliError) as context:
             client.request("GET", "/v1/connections")
 
-        self.assertIn("Missing Fivetran API credentials", str(context.exception))
+        self.assertIn("Missing Fivetran API key", str(context.exception))
+
+    def test_request_uses_encoded_api_key_directly_in_basic_auth_header(self):
+        client = FivetranClient(
+            ClientConfig(api_key="already-base64", base_url="https://api.example.test")
+        )
+        response = MagicMock()
+        response.read.return_value = b'{"data":{"ok":true}}'
+        response.__enter__.return_value = response
+
+        with patch("urllib.request.urlopen", return_value=response) as urlopen:
+            client.request("GET", "/v1/account/info")
+
+        request = urlopen.call_args.args[0]
+        self.assertEqual(request.headers["Authorization"], "Basic already-base64")
+
+    def test_request_accepts_api_key_with_basic_prefix(self):
+        client = FivetranClient(
+            ClientConfig(api_key="Basic already-base64", base_url="https://api.example.test")
+        )
+        response = MagicMock()
+        response.read.return_value = b'{"data":{"ok":true}}'
+        response.__enter__.return_value = response
+
+        with patch("urllib.request.urlopen", return_value=response) as urlopen:
+            client.request("GET", "/v1/account/info")
+
+        request = urlopen.call_args.args[0]
+        self.assertEqual(request.headers["Authorization"], "Basic already-base64")
 
     def test_url_omits_empty_query_values(self):
         client = FivetranClient(
-            ClientConfig(api_key="key", api_secret="secret", base_url="https://api.example.test/")
+            ClientConfig(api_key="encoded-key", base_url="https://api.example.test/")
         )
 
         self.assertEqual(