From d301e36ad387056592df4e3cbda829491c921ca6 Mon Sep 17 00:00:00 2001 From: Neeraj Kashyap Date: Tue, 3 Aug 2021 09:23:18 -0700 Subject: [PATCH] Some small fixes to the subscription-types CLI --- backend/moonstream/cli.py | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/backend/moonstream/cli.py b/backend/moonstream/cli.py index 14b33005..217e8f5c 100644 --- a/backend/moonstream/cli.py +++ b/backend/moonstream/cli.py @@ -2,10 +2,6 @@ Moonstream CLI """ import argparse -from distutils.util import strtobool -import json -from typing import List -import uuid from bugout.data import BugoutResource, BugoutResources from bugout.exceptions import BugoutResponseException @@ -33,7 +29,6 @@ def add_subscription_handler(args: argparse.Namespace) -> None: params = {"type": "subscription_type"} try: - # resolve index try: resources: BugoutResources = bc.list_resources( @@ -57,6 +52,7 @@ def add_subscription_handler(args: argparse.Namespace) -> None: print("Unexpected Exception on request to brood") subscription_data = { + "type": "subscription_type", "id": str(new_subscription_id), "name": args.name, "description": args.description, @@ -64,17 +60,11 @@ def add_subscription_handler(args: argparse.Namespace) -> None: "active": args.active, } - # Add subscriptions - - resource_data = {"type": "subscription_type"} - resource_data.update(subscription_data) - try: - - resource: BugoutResource = bc.create_resource( + bc.create_resource( token=MOONSTREAM_ADMIN_ACCESS_TOKEN, application_id=MOONSTREAM_APPLICATION_ID, - resource_data=resource_data, + resource_data=subscription_data, ) except BugoutResponseException as e: print(f"status_code={e.status_code}, detail={e.detail}") @@ -95,7 +85,7 @@ def main() -> None: subcommands = parser.add_subparsers(description="Moonstream commands") parser_subscription = subcommands.add_parser( - "subscription", description="Moonstream subscription" + "subscription-type", description="Manage Moonstream subscription types" ) parser_subscription.set_defaults(func=lambda _: parser_subscription.print_help()) subcommands_subscription = parser_subscription.add_subparsers( @@ -125,7 +115,7 @@ def main() -> None: "--subscription_plan_id", required=False, type=str, - help="Stripe sibscription id", + help="Stripe subscription id", ) parser_subscription_create.add_argument( "--active", @@ -133,3 +123,10 @@ def main() -> None: help="Set this flag to create a verified user", ) parser_subscription_create.set_defaults(func=add_subscription_handler) + + args = parser.parse_args() + args.func(args) + + +if __name__ == "__main__": + main()