Revert "move cli-specific auth to CliSession, add tests for CliSession"

This reverts commit 8881453.

Author: jreiberkyle

planet/cli/data.py

@@ -37,8 +37,10 @@
 
 @asynccontextmanager
 async def data_client(ctx):
-    async with CliSession() as sess:
-        cl = DataClient(sess, base_url=ctx.obj['BASE_URL'])
+    auth = ctx.obj['AUTH']
+    base_url = ctx.obj['BASE_URL']
+    async with CliSession(auth=auth) as sess:
+        cl = DataClient(sess, base_url=base_url)
         yield cl
 
 
@@ -50,6 +52,7 @@ async def data_client(ctx):
               help='Assign custom base Orders API URL.')
 def data(ctx, base_url):
     '''Commands for interacting with the Data API'''
+    ctx.obj['AUTH'] = None
     ctx.obj['BASE_URL'] = base_url
 
 

planet/cli/orders.py

@@ -31,8 +31,9 @@
 
 @asynccontextmanager
 async def orders_client(ctx):
+    auth = ctx.obj['AUTH']
     base_url = ctx.obj['BASE_URL']
-    async with CliSession() as sess:
+    async with CliSession(auth=auth) as sess:
         cl = OrdersClient(sess, base_url=base_url)
         yield cl
 
@@ -45,6 +46,7 @@ async def orders_client(ctx):
               help='Assign custom base Orders API URL.')
 def orders(ctx, base_url):
     '''Commands for interacting with the Orders API'''
+    ctx.obj['AUTH'] = None
     ctx.obj['BASE_URL'] = base_url
 
 

planet/cli/session.py

@@ -1,11 +1,12 @@
 """CLI HTTP/auth sessions."""
 
-from planet.auth import Auth
+from planet.auth import AuthType
 from planet.http import Session
+from typing import Optional
 
 
 class CliSession(Session):
-    """Session with CLI-specific auth and identifying header"""
-    def __init__(self):
-        super().__init__(Auth.from_file())
+
+    def __init__(self, auth: Optional[AuthType] = None):
+        super().__init__(auth)
         self._client.headers.update({'X-Planet-App': 'python-cli'})

planet/cli/subscriptions.py

@@ -14,7 +14,9 @@
 @click.pass_context
 def subscriptions(ctx):
     '''Commands for interacting with the Subscriptions API'''
-    pass
+    # None means that order of precedence is 1) environment variable,
+    # 2) secret file.
+    ctx.obj['AUTH'] = None
 
 
 # We want our command to be known as "list" on the command line but
@@ -38,7 +40,7 @@ def subscriptions(ctx):
 @coro
 async def list_subscriptions_cmd(ctx, status, limit, pretty):
     """Prints a sequence of JSON-encoded Subscription descriptions."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         subs_aiter = client.list_subscriptions_aiter(status=status,
                                                      limit=limit)
@@ -75,7 +77,7 @@ def parse_request(ctx, param, value: str) -> dict:
 @coro
 async def create_subscription_cmd(ctx, request, pretty):
     """Submits a subscription request and prints the API response."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         sub = await client.create_subscription(request)
         echo_json(sub, pretty)
@@ -89,7 +91,7 @@ async def create_subscription_cmd(ctx, request, pretty):
 @coro
 async def cancel_subscription_cmd(ctx, subscription_id, pretty):
     """Cancels a subscription and prints the API response."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         sub = await client.cancel_subscription(subscription_id)
         echo_json(sub, pretty)
@@ -104,7 +106,7 @@ async def cancel_subscription_cmd(ctx, subscription_id, pretty):
 @coro
 async def update_subscription_cmd(ctx, subscription_id, request, pretty):
     """Updates a subscription and prints the API response."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         sub = await client.update_subscription(subscription_id, request)
         echo_json(sub, pretty)
@@ -118,7 +120,7 @@ async def update_subscription_cmd(ctx, subscription_id, request, pretty):
 @coro
 async def describe_subscription_cmd(ctx, subscription_id, pretty):
     """Gets the description of a subscription and prints the API response."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         sub = await client.get_subscription(subscription_id)
         echo_json(sub, pretty)
@@ -154,7 +156,7 @@ async def list_subscription_results_cmd(ctx,
                                         status,
                                         limit):
     """Gets results of a subscription and prints the API response."""
-    async with CliSession() as session:
+    async with CliSession(auth=ctx.obj['AUTH']) as session:
         client = SubscriptionsClient(session)
         results_aiter = client.get_results_aiter(subscription_id,
                                                  status=status,