apigeecli 0.53.7__tar.gz → 0.53.8__tar.gz

{apigeecli-0.53.7/apigeecli.egg-info → apigeecli-0.53.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: apigeecli
-Version: 0.53.7
+Version: 0.53.8
 Summary: (DEPRECATED) apigeecli simplifies and automates Apigee Edge API usage.
 Home-page: https://github.com/darumatic/apigee-cli
 Author: Matthew Delotavo
@@ -29,6 +29,10 @@ apigee-cli
 
    This tool is no longer actively maintained.
 
+.. warning::
+
+   We primarily use and test with SSO; basic and MFA authentication may still work, but we no longer actively use or verify them.
+
 The Apigee Edge command-line interface is an unofficial Python command-line tool built to simplify and automate Apigee Edge API usage, with support for SSO, MFA, and basic authentication.
 
 -----------------------------------------
@@ -53,8 +57,7 @@ or for your user::
 
     $ pip install --user apigeecli
 
-If you have the apigee-cli installed and want to upgrade to the latest version
-you can run::
+If you have the apigee-cli installed and want to upgrade to the latest version you can run::
 
     $ pip install --upgrade apigeecli
 
@@ -62,8 +65,7 @@ you can run::
 Getting Started
 ---------------
 
-Before using apigee-cli, you need to tell it about your Apigee Edge credentials. You
-can do this in three ways:
+Before using apigee-cli, you need to tell it about your Apigee Edge credentials. You can do this in three ways:
 
 * Environment variables
 * Config file
@@ -126,15 +128,13 @@ Run the following command to get a list of API proxies in your ``default`` Apige
 Troubleshooting
 ^^^^^^^^^^^^^^^
 
-If you encounter issues with commands, you can find more detailed debug information and error messages in the log file:
-
-::
+If you encounter issues with commands, check the log file for detailed debug information and error messages::
 
     ~/.apigee/exceptions.log
 
-Reviewing this file can help you diagnose installation problems, missing dependencies, or errors related to Apigee Edge. 
+This file can help diagnose installation problems, missing dependencies, or errors related to Apigee Edge.
 
-You can also use the verbose flags `-v` or `-vv` with commands to see more detailed information about requests to Apigee Edge.
+You can also use the verbose flags ``-v`` or ``-vv`` with commands to see more detailed request information.
 
 -------------
 Running Tests
@@ -176,64 +176,47 @@ Disclaimer
 
 This tool is not affiliated with Apigee or Google and is highly experimental.
 
-
 .. _`official Apigee CLI`: https://github.com/apigee/apigeetool-node
 
 .. |Upload Python Package badge| image:: https://github.com/mdelotavo/apigee-cli/workflows/Upload%20Python%20Package/badge.svg
-    :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Upload+Python+Package%22
+   :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Upload+Python+Package%22
 
 .. |Python package badge| image:: https://github.com/mdelotavo/apigee-cli/workflows/Python%20package/badge.svg
-    :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Python+package%22
+   :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Python+package%22
 
 .. |Code style: black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+   :target: https://github.com/psf/black
 
 .. |PyPI| image:: https://img.shields.io/pypi/v/apigeecli
-    :target: https://pypi.org/project/apigeecli/
+   :target: https://pypi.org/project/apigeecli/
 
 .. |License| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
-    :target: https://opensource.org/licenses/Apache-2.0
+   :target: https://opensource.org/licenses/Apache-2.0
 
 .. |Python version| image:: https://img.shields.io/pypi/pyversions/apigeecli
-    :target: https://pypi.org/project/apigeecli/
+   :target: https://pypi.org/project/apigeecli/
 
 .. |PyPI Version| image:: https://badge.fury.io/py/apigeecli.svg
    :target: https://badge.fury.io/py/apigeecli
 
 .. |Downloads| image:: https://pepy.tech/badge/apigeecli
-    :target: https://pepy.tech/project/apigeecli
+   :target: https://pepy.tech/project/apigeecli
 
 .. _`Apigee Product Documentation`: https://apidocs.apigee.com/management/apis
-
 .. _`Permissions reference`: https://docs.apigee.com/api-platform/system-administration/permissions
-
 .. _`Add permissions to testing role`: https://docs.apigee.com/api-platform/system-administration/managing-roles-api#addpermissionstotestingrole
-
 .. _pip: http://www.pip-installer.org/en/latest/
-
 .. _`Universal Command Line Interface for Amazon Web Services`: https://github.com/aws/aws-cli
-
 .. _`The Apigee Management API command-line interface documentation`: https://darumatic.github.io/apigee-cli/index.html
-
 .. _`GitHub`: https://github.com/darumatic/apigee-cli
-
 .. _`Python Package Index (PyPI)`: https://pypi.org/project/apigeecli/
-
 .. _`Access the Edge API with SAML`: https://docs.apigee.com/api-platform/system-administration/using-saml
-
 .. _`Commands cheatsheet`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Using SAML with automated tasks`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Tabulating deployments`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Tabulating resource permissions`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Troubleshooting`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Mirror`: https://github.com/mdelotavo/apigee-cli
-
 .. _`Apigee CI/CD Docker releases`: https://hub.docker.com/r/darumatic/apigee-cicd
 
 
-

{apigeecli-0.53.7 → apigeecli-0.53.8}/README.rst

@@ -8,6 +8,10 @@ apigee-cli
 
    This tool is no longer actively maintained.
 
+.. warning::
+
+   We primarily use and test with SSO; basic and MFA authentication may still work, but we no longer actively use or verify them.
+
 The Apigee Edge command-line interface is an unofficial Python command-line tool built to simplify and automate Apigee Edge API usage, with support for SSO, MFA, and basic authentication.
 
 -----------------------------------------
@@ -32,8 +36,7 @@ or for your user::
 
     $ pip install --user apigeecli
 
-If you have the apigee-cli installed and want to upgrade to the latest version
-you can run::
+If you have the apigee-cli installed and want to upgrade to the latest version you can run::
 
     $ pip install --upgrade apigeecli
 
@@ -41,8 +44,7 @@ you can run::
 Getting Started
 ---------------
 
-Before using apigee-cli, you need to tell it about your Apigee Edge credentials. You
-can do this in three ways:
+Before using apigee-cli, you need to tell it about your Apigee Edge credentials. You can do this in three ways:
 
 * Environment variables
 * Config file
@@ -105,15 +107,13 @@ Run the following command to get a list of API proxies in your ``default`` Apige
 Troubleshooting
 ^^^^^^^^^^^^^^^
 
-If you encounter issues with commands, you can find more detailed debug information and error messages in the log file:
-
-::
+If you encounter issues with commands, check the log file for detailed debug information and error messages::
 
     ~/.apigee/exceptions.log
 
-Reviewing this file can help you diagnose installation problems, missing dependencies, or errors related to Apigee Edge. 
+This file can help diagnose installation problems, missing dependencies, or errors related to Apigee Edge.
 
-You can also use the verbose flags `-v` or `-vv` with commands to see more detailed information about requests to Apigee Edge.
+You can also use the verbose flags ``-v`` or ``-vv`` with commands to see more detailed request information.
 
 -------------
 Running Tests
@@ -155,62 +155,45 @@ Disclaimer
 
 This tool is not affiliated with Apigee or Google and is highly experimental.
 
-
 .. _`official Apigee CLI`: https://github.com/apigee/apigeetool-node
 
 .. |Upload Python Package badge| image:: https://github.com/mdelotavo/apigee-cli/workflows/Upload%20Python%20Package/badge.svg
-    :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Upload+Python+Package%22
+   :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Upload+Python+Package%22
 
 .. |Python package badge| image:: https://github.com/mdelotavo/apigee-cli/workflows/Python%20package/badge.svg
-    :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Python+package%22
+   :target: https://github.com/mdelotavo/apigee-cli/actions?query=workflow%3A%22Python+package%22
 
 .. |Code style: black| image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/psf/black
+   :target: https://github.com/psf/black
 
 .. |PyPI| image:: https://img.shields.io/pypi/v/apigeecli
-    :target: https://pypi.org/project/apigeecli/
+   :target: https://pypi.org/project/apigeecli/
 
 .. |License| image:: https://img.shields.io/badge/License-Apache%202.0-blue.svg
-    :target: https://opensource.org/licenses/Apache-2.0
+   :target: https://opensource.org/licenses/Apache-2.0
 
 .. |Python version| image:: https://img.shields.io/pypi/pyversions/apigeecli
-    :target: https://pypi.org/project/apigeecli/
+   :target: https://pypi.org/project/apigeecli/
 
 .. |PyPI Version| image:: https://badge.fury.io/py/apigeecli.svg
    :target: https://badge.fury.io/py/apigeecli
 
 .. |Downloads| image:: https://pepy.tech/badge/apigeecli
-    :target: https://pepy.tech/project/apigeecli
+   :target: https://pepy.tech/project/apigeecli
 
 .. _`Apigee Product Documentation`: https://apidocs.apigee.com/management/apis
-
 .. _`Permissions reference`: https://docs.apigee.com/api-platform/system-administration/permissions
-
 .. _`Add permissions to testing role`: https://docs.apigee.com/api-platform/system-administration/managing-roles-api#addpermissionstotestingrole
-
 .. _pip: http://www.pip-installer.org/en/latest/
-
 .. _`Universal Command Line Interface for Amazon Web Services`: https://github.com/aws/aws-cli
-
 .. _`The Apigee Management API command-line interface documentation`: https://darumatic.github.io/apigee-cli/index.html
-
 .. _`GitHub`: https://github.com/darumatic/apigee-cli
-
 .. _`Python Package Index (PyPI)`: https://pypi.org/project/apigeecli/
-
 .. _`Access the Edge API with SAML`: https://docs.apigee.com/api-platform/system-administration/using-saml
-
 .. _`Commands cheatsheet`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Using SAML with automated tasks`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Tabulating deployments`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Tabulating resource permissions`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Troubleshooting`: https://github.com/mdelotavo/apigee-cli-docs
-
 .. _`Mirror`: https://github.com/mdelotavo/apigee-cli
-
 .. _`Apigee CI/CD Docker releases`: https://hub.docker.com/r/darumatic/apigee-cicd
-

{apigeecli-0.53.7 → apigeecli-0.53.8}/apigee/__init__.py

@@ -6,32 +6,30 @@ from apigee import utils_init
 
 APP = "apigeecli"
 CMD = "apigee"
-__version__ = "0.53.7"
+__version__ = "0.53.8"
 description = "(DEPRECATED) apigeecli simplifies and automates Apigee Edge API usage."
 long_description = """The Apigee Edge command-line interface is an unofficial Python command-line tool built to simplify and automate Apigee Edge API usage, with support for SSO, MFA, and basic authentication."""
 
 APIGEE_CLI_DIRECTORY = utils_init.join_path_components(Path.home(), ".apigee")
-APIGEE_CLI_PLUGINS_DIRECTORY = utils_init.join_path_components(APIGEE_CLI_DIRECTORY, "plugins")
+APIGEE_CLI_PLUGINS_DIRECTORY = utils_init.join_path_components(
+    APIGEE_CLI_DIRECTORY, "plugins")
 
 APIGEE_ADMIN_API_URL = "https://api.enterprise.apigee.com"
 APIGEE_CLI_ACCESS_TOKEN_FILE = utils_init.join_path_components(
-    APIGEE_CLI_DIRECTORY, "access_token"
-)
+    APIGEE_CLI_DIRECTORY, "access_token")
 APIGEE_CLI_REFRESH_TOKEN_FILE = utils_init.join_path_components(
-    APIGEE_CLI_DIRECTORY, "refresh_token"
-)
-APIGEE_CLI_CREDENTIALS_FILE = utils_init.join_path_components(APIGEE_CLI_DIRECTORY, "credentials")
+    APIGEE_CLI_DIRECTORY, "refresh_token")
+APIGEE_CLI_CREDENTIALS_FILE = utils_init.join_path_components(
+    APIGEE_CLI_DIRECTORY, "credentials")
 # APIGEE_CLI_EXCEPTION_LOG_FILE = utils.build_path_str(APIGEE_CLI_DIRECTORY, 'exception.log')
 APIGEE_CLI_EXCEPTIONS_LOG_FILE = utils_init.join_path_components(
-    APIGEE_CLI_DIRECTORY, "exceptions.log"
-)
-APIGEE_CLI_IS_MACHINE_USER = utils_init.is_truthy_envvar(getenv("APIGEE_CLI_IS_MACHINE_USER"))
+    APIGEE_CLI_DIRECTORY, "exceptions.log")
+APIGEE_CLI_IS_MACHINE_USER = utils_init.is_truthy_envvar(
+    getenv("APIGEE_CLI_IS_MACHINE_USER"))
 APIGEE_CLI_PLUGINS_CONFIG_FILE = utils_init.join_path_components(
-    APIGEE_CLI_PLUGINS_DIRECTORY, "config"
-)
+    APIGEE_CLI_PLUGINS_DIRECTORY, "config")
 APIGEE_CLI_PLUGINS_PATH = utils_init.join_path_components(
-    APIGEE_CLI_PLUGINS_DIRECTORY, "__init__.py"
-)
+    APIGEE_CLI_PLUGINS_DIRECTORY, "__init__.py")
 APIGEE_CLI_PREFIX = getenv("APIGEE_CLI_PREFIX")
 APIGEE_CLI_SYMMETRIC_KEY = getenv("APIGEE_CLI_SYMMETRIC_KEY")
 APIGEE_CLI_TOGGLE_SILENT = False
@@ -47,4 +45,4 @@ APIGEE_ZONENAME = getenv("APIGEE_ZONENAME")
 APIGEE_ZONENAME_OAUTH_URL = "https://{zonename}.login.apigee.com/oauth/token"
 
 builtins.APIGEE_CLI_TOGGLE_SILENT = APIGEE_CLI_TOGGLE_SILENT
-builtins.APIGEE_CLI_TOGGLE_VERBOSE = APIGEE_CLI_TOGGLE_VERBOSE
+builtins.APIGEE_CLI_TOGGLE_VERBOSE = APIGEE_CLI_TOGGLE_VERBOSE

{apigeecli-0.53.7 → apigeecli-0.53.8}/apigee/__main__.py

@@ -5,7 +5,8 @@ from functools import update_wrapper
 
 import click
 
-from apigee import (APIGEE_CLI_EXCEPTIONS_LOG_FILE, APIGEE_CLI_PLUGINS_DIRECTORY, CMD)
+from apigee import (APIGEE_CLI_EXCEPTIONS_LOG_FILE,
+                    APIGEE_CLI_PLUGINS_DIRECTORY, CMD)
 from apigee import __version__ as version
 from apigee.apiproducts.commands import apiproducts
 from apigee.apis.commands import apis
@@ -17,7 +18,8 @@ from apigee.cls import AliasedGroup
 from apigee.configure.commands import configure
 from apigee.deployments.commands import deployments
 from apigee.developers.commands import developers
-from apigee.exceptions import wrap_with_exception_handling, configure_global_logger
+from apigee.exceptions import (configure_global_logger,
+                               wrap_with_exception_handling)
 from apigee.keystores.commands import keystores
 from apigee.keyvaluemaps.commands import keyvaluemaps
 from apigee.maskconfigs.commands import maskconfigs
@@ -27,12 +29,12 @@ from apigee.references.commands import references
 from apigee.sharedflows.commands import sharedflows
 from apigee.targetservers.commands import targetservers
 from apigee.userroles.commands import userroles
-from apigee.utils import (import_plugins_from_directory, execute_function_on_directory_files)
+from apigee.utils import (execute_function_on_directory_files,
+                          import_plugins_from_directory)
 from apigee.virtualhosts.commands import virtualhosts
 
 # from click_aliases import ClickAliasedGroup
 
-
 CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])
 
 
@@ -89,7 +91,7 @@ def main():
     execute_function_on_directory_files(
         APIGEE_CLI_PLUGINS_DIRECTORY,
         import_plugins_from_directory,
-        args=(cli_commands,),
+        args=(cli_commands, ),
         glob="[!.][!__]*/__init__.py",
     )
 

{apigeecli-0.53.7 → apigeecli-0.53.8}/apigee/apiproducts/apiproducts.py

@@ -15,18 +15,21 @@ UPDATE_API_PRODUCT_PATH = "{api_url}/v1/organizations/{org}/apiproducts/{name}"
 
 
 class Apiproducts:
+
     def __init__(self, auth, org_name, apiproduct_name):
         self.auth = auth
         self.org_name = org_name
         self.apiproduct_name = apiproduct_name
 
     def create_api_product(self, request_body):
-        uri = CREATE_API_PRODUCT_PATH.format(
-            api_url=APIGEE_ADMIN_API_URL, org=self.org_name
-        )
+        uri = CREATE_API_PRODUCT_PATH.format(api_url=APIGEE_ADMIN_API_URL,
+                                             org=self.org_name)
         hdrs = auth.set_authentication_headers(
             self.auth,
-            custom_headers={"Accept": "application/json", "Content-Type": "application/json"},
+            custom_headers={
+                "Accept": "application/json",
+                "Content-Type": "application/json"
+            },
         )
         body = json.loads(request_body)
         resp = requests.post(uri, headers=hdrs, json=body)
@@ -34,26 +37,31 @@ class Apiproducts:
         return resp
 
     def delete_api_product(self):
-        uri = DELETE_API_PRODUCT_PATH.format(
-            api_url=APIGEE_ADMIN_API_URL, org=self.org_name, name=self.apiproduct_name
-        )
-        hdrs = auth.set_authentication_headers(self.auth, custom_headers={"Accept": "application/json"})
+        uri = DELETE_API_PRODUCT_PATH.format(api_url=APIGEE_ADMIN_API_URL,
+                                             org=self.org_name,
+                                             name=self.apiproduct_name)
+        hdrs = auth.set_authentication_headers(
+            self.auth, custom_headers={"Accept": "application/json"})
         resp = requests.delete(uri, headers=hdrs)
         resp.raise_for_status()
         return resp
 
     def get_api_product(self):  # sourcery skip: class-extract-method
-        uri = GET_API_PRODUCT_PATH.format(
-            api_url=APIGEE_ADMIN_API_URL, org=self.org_name, name=self.apiproduct_name
-        )
-        hdrs = auth.set_authentication_headers(self.auth, custom_headers={"Accept": "application/json"})
+        uri = GET_API_PRODUCT_PATH.format(api_url=APIGEE_ADMIN_API_URL,
+                                          org=self.org_name,
+                                          name=self.apiproduct_name)
+        hdrs = auth.set_authentication_headers(
+            self.auth, custom_headers={"Accept": "application/json"})
         resp = requests.get(uri, headers=hdrs)
         resp.raise_for_status()
         return resp
 
-    def list_api_products(
-        self, prefix=None, expand=False, count=1000, startkey="", format="json"
-    ):
+    def list_api_products(self,
+                          prefix=None,
+                          expand=False,
+                          count=1000,
+                          startkey="",
+                          format="json"):
         uri = LIST_API_PRODUCTS_PATH.format(
             api_url=APIGEE_ADMIN_API_URL,
             org=self.org_name,
@@ -61,10 +69,13 @@ class Apiproducts:
             count=count,
             startkey=startkey,
         )
-        hdrs = auth.set_authentication_headers(self.auth, custom_headers={"Accept": "application/json"})
+        hdrs = auth.set_authentication_headers(
+            self.auth, custom_headers={"Accept": "application/json"})
         resp = requests.get(uri, headers=hdrs)
         resp.raise_for_status()
-        return ApiproductsSerializer().serialize_details(resp, format, prefix=prefix)
+        return ApiproductsSerializer().serialize_details(resp,
+                                                         format,
+                                                         prefix=prefix)
 
     def push_apiproducts(self, file):
         apiproduct = read_file_content(file, type="json")
@@ -80,12 +91,15 @@ class Apiproducts:
             console.echo(self.create_api_product(json.dumps(apiproduct)).text)
 
     def update_api_product(self, request_body):
-        uri = UPDATE_API_PRODUCT_PATH.format(
-            api_url=APIGEE_ADMIN_API_URL, org=self.org_name, name=self.apiproduct_name
-        )
+        uri = UPDATE_API_PRODUCT_PATH.format(api_url=APIGEE_ADMIN_API_URL,
+                                             org=self.org_name,
+                                             name=self.apiproduct_name)
         hdrs = auth.set_authentication_headers(
             self.auth,
-            custom_headers={"Accept": "application/json", "Content-Type": "application/json"},
+            custom_headers={
+                "Accept": "application/json",
+                "Content-Type": "application/json"
+            },
         )
         body = json.loads(request_body)
         resp = requests.put(uri, headers=hdrs, json=body)

apigeecli-0.53.8/apigee/apiproducts/commands.py

@@ -0,0 +1,167 @@
+import click
+
+from apigee import console
+from apigee.apiproducts.apiproducts import Apiproducts
+from apigee.auth import common_auth_options, generate_authentication
+from apigee.prefix import common_prefix_options
+from apigee.silent import common_silent_options
+from apigee.verbose import common_verbose_options
+
+
+@click.group(
+    help=
+    "API products enable you to bundle and distribute your APIs to multiple developer groups simultaneously, without having to modify code."
+)
+def apiproducts():
+    pass
+
+
+def _create_api_product(username, password, mfa_secret, token, zonename, org,
+                        profile, name, body, **kwargs):
+    return (Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org,
+        name).create_api_product(body).text)
+
+
+@apiproducts.command(help="Creates an API product in an organization.")
+@common_auth_options
+@common_verbose_options
+@common_silent_options
+@click.option("-n", "--name", help="name", required=True)
+@click.option("-b", "--body", help="request body", required=True)
+def create(*args, **kwargs):
+    console.echo(_create_api_product(*args, **kwargs))
+
+
+def _delete_api_product(username, password, mfa_secret, token, zonename, org,
+                        profile, name, **kwargs):
+    return (Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org,
+        name).delete_api_product().text)
+
+
+@apiproducts.command(help="Deletes an API product from an organization.")
+@common_auth_options
+@common_verbose_options
+@common_silent_options
+@click.option("-n", "--name", help="name", required=True)
+def delete(*args, **kwargs):
+    console.echo(_delete_api_product(*args, **kwargs))
+
+
+def _get_api_product(username, password, mfa_secret, token, zonename, org,
+                     profile, name, **kwargs):
+    return (Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org, name).get_api_product().text)
+
+
+@apiproducts.command(
+    help=
+    'Gets configuration data for an API product. The API product name required in the request URL is not the "Display Name" value displayed for the API product in the Edge UI. While they may be the same, they are not always the same depending on whether the API product was created via UI or API.'
+)
+@common_auth_options
+@common_verbose_options
+@common_silent_options
+@click.option("-n", "--name", help="name", required=True)
+def get(*args, **kwargs):
+    console.echo(_get_api_product(*args, **kwargs))
+
+
+def _list_api_products(username,
+                       password,
+                       mfa_secret,
+                       token,
+                       zonename,
+                       org,
+                       profile,
+                       prefix=None,
+                       expand=False,
+                       count=1000,
+                       startkey="",
+                       **kwargs):
+    return Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org,
+        None).list_api_products(prefix=prefix,
+                                expand=expand,
+                                count=count,
+                                startkey=startkey)
+
+
+@apiproducts.command(
+    help="Get a list of all API product names for an organization.")
+@common_auth_options
+@common_verbose_options
+@common_silent_options
+@common_prefix_options
+@click.option(
+    "--expand/--no-expand",
+    default=False,
+    help="Set to 'true' to get expanded details about each product.",
+)
+@click.option(
+    "--count",
+    type=click.INT,
+    default=1000,
+    show_default=True,
+    help=
+    "Number of API products to return in the API call. The maximum limit is 1000. Use with the startkey to provide more targeted filtering.",
+)
+@click.option(
+    "--startkey",
+    default="",
+    show_default=True,
+    help=
+    "Returns a list of API products starting with the specified API product.",
+)
+def list(*args, **kwargs):
+    console.echo(_list_api_products(*args, **kwargs))
+
+
+def _update_api_product(username, password, mfa_secret, token, zonename, org,
+                        profile, name, body, **kwargs):
+    return (Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org,
+        name).update_api_product(body).text)
+
+
+@apiproducts.command(
+    help=
+    "Updates an existing API product. You must include all required values, whether or not you are updating them, as well as any optional values that you are updating."
+)
+@common_auth_options
+@common_verbose_options
+@common_silent_options
+@click.option("-n", "--name", help="name", required=True)
+@click.option("-b", "--body", help="request body", required=True)
+def update(*args, **kwargs):
+    console.echo(_update_api_product(*args, **kwargs))
+
+
+def _push_apiproducts(username, password, mfa_secret, token, zonename, org,
+                      profile, file, **kwargs):
+    return Apiproducts(
+        generate_authentication(username, password, mfa_secret, token,
+                                zonename), org, None).push_apiproducts(file)
+
+
+@apiproducts.command(
+    help="Push API product to Apigee. This will create/update an API product.")
+@common_auth_options
+@common_silent_options
+@common_verbose_options
+@click.option(
+    "-f",
+    "--file",
+    type=click.Path(exists=True,
+                    dir_okay=False,
+                    file_okay=True,
+                    resolve_path=False),
+    required=True,
+)
+def push(*args, **kwargs):
+    _push_apiproducts(*args, **kwargs)

{apigeecli-0.53.7 → apigeecli-0.53.8}/apigee/apiproducts/serializer.py

@@ -2,6 +2,7 @@ import json
 
 
 class ApiproductsSerializer:
+
     def serialize_details(self, apiproducts, format, prefix=None):
         resp = apiproducts
         if format == "text":
@@ -9,8 +10,7 @@ class ApiproductsSerializer:
         apiproducts = apiproducts.json()
         if prefix:
             apiproducts = [
-                apiproduct
-                for apiproduct in apiproducts
+                apiproduct for apiproduct in apiproducts
                 if apiproduct.startswith(prefix)
             ]
         if format == "dict":