agilicus 1.234.0__py3-none-any.whl → 1.234.1__py3-none-any.whl

agilicus/agilicus_api/test/test_workload_configuration.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_certificate.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_certificate_spec.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_certificate_status.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_root_certificate.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_root_certificate_spec.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_x509_root_certificate_status.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api/test/test_xss_settings.py

@@ -3,7 +3,7 @@
 
     Agilicus is API-first. Modern software is controlled by other software, is open, is available for you to use the way you want, securely, simply.  The OpenAPI Specification in YAML format is available on [www](https://www.agilicus.com/www/api/agilicus-openapi.yaml) for importing to other tools.  A rendered, online viewable and usable version of this specification is available at [api](https://www.agilicus.com/api). You may try the API inline directly in the web page. To do so, first obtain an Authentication Token (the simplest way is to install the Python SDK, and then run `agilicus-cli --issuer https://MYISSUER get-token`). You will need an org-id for most calls (and can obtain from `agilicus-cli --issuer https://MYISSUER list-orgs`). The `MYISSUER` will typically be `auth.MYDOMAIN`, and you will see it as you sign-in to the administrative UI.  This API releases on Bearer-Token authentication. To obtain a valid bearer token you will need to Authenticate to an Issuer with OpenID Connect (a superset of OAUTH2).  Your \"issuer\" will look like https://auth.MYDOMAIN. For example, when you signed-up, if you said \"use my own domain name\" and assigned a CNAME of cloud.example.com, then your issuer would be https://auth.cloud.example.com.  If you selected \"use an Agilicus supplied domain name\", your issuer would look like https://auth.myorg.agilicus.cloud.  For test purposes you can use our [Python SDK](https://pypi.org/project/agilicus/) and run `agilicus-cli --issuer https://auth.MYDOMAIN get-token`.  This API may be used in any language runtime that supports OpenAPI 3.0, or, you may use our [Python SDK](https://pypi.org/project/agilicus/), our [Typescript SDK](https://www.npmjs.com/package/@agilicus/angular), or our [Golang SDK](https://git.agilicus.com/pub/sdk-go).  100% of the activities in our system our API-driven, from our web-admin, through our progressive web applications, to all internals: there is nothing that is not accessible.  For more information, see [developer resources](https://www.agilicus.com/developer).   # noqa: E501
 
-    The version of the OpenAPI document: 2023.12.08
+    The version of the OpenAPI document: 2023.12.11
     Contact: dev@agilicus.com
     Generated by: https://openapi-generator.tech
 """

agilicus/agilicus_api_README.md

@@ -3,8 +3,8 @@ Agilicus is API-first. Modern software is controlled by other software, is open,
 
 The `agilicus_api` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 2023.12.08
-- Package version: 1.234.0
+- API version: 2023.12.11
+- Package version: 1.234.1
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 
@@ -614,6 +614,11 @@ Class | Method | HTTP request | Description
 *PolicyApi* | [**get_challenge_decision**](agilicus_api/docs/PolicyApi.md#get_challenge_decision) | **POST** /v1/data/authentication/mfa_policy/allow | evaluate a policy challenge decision
 *PolicyApi* | [**get_enrollment_decision**](agilicus_api/docs/PolicyApi.md#get_enrollment_decision) | **POST** /v1/data/authentication/enrollment/allow | evaluate a policy enrollment decision
 *PolicyApi* | [**map_attributes**](agilicus_api/docs/PolicyApi.md#map_attributes) | **POST** /v1/data/authentication/attribute_mapping/map_attributes | map attributes of a user
+*ProductsApi* | [**v2_create_product**](agilicus_api/docs/ProductsApi.md#v2_create_product) | **POST** /v2/products | Create a product
+*ProductsApi* | [**v2_delete_product**](agilicus_api/docs/ProductsApi.md#v2_delete_product) | **DELETE** /v2/products/{product_id} | Delete a product
+*ProductsApi* | [**v2_get_product**](agilicus_api/docs/ProductsApi.md#v2_get_product) | **GET** /v2/products/{product_id} | Get a single product
+*ProductsApi* | [**v2_list_products**](agilicus_api/docs/ProductsApi.md#v2_list_products) | **GET** /v2/products | Get all products
+*ProductsApi* | [**v2_replace_product**](agilicus_api/docs/ProductsApi.md#v2_replace_product) | **PUT** /v2/products/{product_id} | Create or update a product
 *RegionsApi* | [**add_point_of_presence**](agilicus_api/docs/RegionsApi.md#add_point_of_presence) | **POST** /v1/point_of_presences | Add a point of presence.
 *RegionsApi* | [**delete_point_of_presence**](agilicus_api/docs/RegionsApi.md#delete_point_of_presence) | **DELETE** /v1/point_of_presences/{point_of_presence_id} | Delete a point of presence
 *RegionsApi* | [**get_point_of_presence**](agilicus_api/docs/RegionsApi.md#get_point_of_presence) | **GET** /v1/point_of_presences/{point_of_presence_id} | Get a point of presence

agilicus/billing.py

@@ -443,137 +443,6 @@ def create_usage_record(
         raise Exception("Need to choose --billing-account-or or --all-accounts")
 
 
-def list_products(ctx, **kwargs):
-    client = get_apiclient_from_ctx(ctx)
-    products = client.billing_api.list_products(**kwargs)
-    products.products = sorted(products.products, key=lambda d: d["spec"]["label"])
-    return products
-
-
-def format_products(ctx, products_obj):
-    products = products_obj.to_dict()
-
-    def get_product_name(record, key):
-        return "{0: <20}".format(record["product"]["name"])
-
-    def get_product_nickname(record, key):
-        return "{0: <28}".format(record["nickname"])
-
-    def get_product_metric(record, key):
-        if "metric" in record["product"]["metadata"]:
-            return "{0: <20}".format(record["product"]["metadata"]["metric"])
-        else:
-            return "{0: <20}".format("")
-
-    def get_unit_amount(record, key):
-        if record["unit_amount"]:
-            return "{:,.2f}".format(record["unit_amount"] / 100)
-        return ""
-
-    product_price_column = [
-        column("id", optional=True),
-        column("product name", getter=get_product_name, optional=True),
-        column("nickname", getter=get_product_nickname, optional=True),
-        column("metric", getter=get_product_metric, optional=True),
-        column("unit_amount", getter=get_unit_amount, optional=True),
-    ]
-    columns = [
-        metadata_column("id"),
-        spec_column("name"),
-        spec_column("label", optional=True),
-        spec_column("description", optional=True),
-        spec_column("trial_period", optional=True),
-        #        spec_column("dev_mode", optional=True),
-        subtable(
-            ctx,
-            "billing_product_prices",
-            product_price_column,
-            table_getter=operator.itemgetter,
-            subobject_name="status",
-            optional=True,
-        ),
-    ]
-    return format_table(
-        ctx, products.get("products"), columns, getter=operator.itemgetter
-    )
-
-
-def add_product(
-    ctx, name=None, dev_mode=None, trial_period=None, product_price_ids=[], **kwargs
-):
-    client = get_apiclient_from_ctx(ctx)
-    prices = []
-    for price_id in product_price_ids:
-        prices.append(agilicus.BillingProductPrice(id=price_id))
-    spec = agilicus.ProductSpec(name=name, billing_product_prices=prices, **kwargs)
-
-    if dev_mode is not None:
-        spec.dev_mode = dev_mode
-    if trial_period is not None:
-        spec.trial_period = trial_period
-
-    product = agilicus.Product(spec=spec)
-
-    return client.billing_api.create_product(product)
-
-
-def delete_product(ctx, product_id=None, **kwargs):
-    client = get_apiclient_from_ctx(ctx)
-    return client.billing_api.delete_product(product_id)
-
-
-def get_product(ctx, product_id=None, **kwargs):
-    client = get_apiclient_from_ctx(ctx)
-    return client.billing_api.get_product(product_id)
-
-
-def update_product(
-    ctx,
-    product_id=None,
-    dev_mode=None,
-    name=None,
-    product_price_ids=None,
-    remove_product_price_ids=None,
-    label=None,
-    description=None,
-    trial_period=None,
-    **kwargs,
-):
-    client = get_apiclient_from_ctx(ctx)
-
-    product = client.billing_api.get_product(product_id)
-
-    if remove_product_price_ids is not None:
-        old_prices = product.spec.billing_product_prices
-        product.spec.billing_product_prices = []
-        for price in old_prices:
-            if price.id in remove_product_price_ids:
-                # needs to be removed.
-                continue
-            product.spec.billing_product_prices.append(price)
-
-    if product_price_ids is not None:
-        for price_id in product_price_ids:
-            product.spec.billing_product_prices.append(
-                agilicus.BillingProductPrice(id=price_id)
-            )
-
-    if dev_mode is not None:
-        product.spec.dev_mode = dev_mode
-    if name is not None:
-        product.spec.name = name
-    if description is not None:
-        product.spec.description = description
-    if label is not None:
-        product.spec.label = label
-    if trial_period is not None:
-        product.spec.trial_period = trial_period
-    return client.billing_api.replace_product(
-        product_id,
-        product=product,
-    )
-
-
 def _get_subscription(org_subscriptions, subscription_id):
     for org_subscription in org_subscriptions:
         if org_subscription.spec.subscription_id == subscription_id:

agilicus/context.py

@@ -79,6 +79,7 @@ class ApiHelper:
         self.credentials_api = agilicus.CredentialsApi(
             agilicus.ApiClient(self.configuration)
         )
+        self.products_api = agilicus.ProductsApi(agilicus.ApiClient(self.configuration))
 
 
 def setup(ctx):

agilicus/main.py

@@ -68,6 +68,7 @@ from .trusted_certs import trusted_certs_main
 from .hosts import hosts_main
 from .labels import labels_main
 from .rules import rules_main
+from .products import products_main
 from .credentials_commands import credentials_main
 
 from .version import __version__
@@ -6879,66 +6880,6 @@ def create_billing_account_account_usage_record(ctx, **kwargs):
     billing.create_usage_record(ctx, **kwargs)
 
 
-@cli.command(name="list-products")
-@click.option("--limit", default=500)
-@click.option("--get-subscription-data", is_flag=True, default=False)
-@click.pass_context
-def list_products(ctx, **kwargs):
-    products = billing.list_products(ctx, **kwargs)
-    table = billing.format_products(ctx, products)
-    print(table)
-
-
-@cli.command(name="add-product")
-@click.argument("name")
-@click.option("--product-price-id", default=None, multiple=True)
-@click.option("--dev-mode", is_flag=True, default=None)
-@click.option("--label", default=None)
-@click.option("--description", default=None)
-@click.option("--trial_period", type=int, default=None)
-@click.pass_context
-def add_product(ctx, product_price_id, **kwargs):
-    product = billing.add_product(
-        ctx, product_price_ids=list(product_price_id), **kwargs
-    )
-    output_entry(ctx, product.to_dict())
-
-
-@cli.command(name="delete-product")
-@click.argument("product-id")
-@click.pass_context
-def delete_product(ctx, **kwargs):
-    billing.delete_product(ctx, **kwargs)
-
-
-@cli.command(name="show-product")
-@click.argument("product_id")
-@click.pass_context
-def show_product(ctx, **kwargs):
-    product = billing.get_product(ctx, **kwargs)
-    output_entry(ctx, product.to_dict())
-
-
-@cli.command(name="update-product")
-@click.argument("product_id")
-@click.option("--dev-mode", is_flag=True, default=None)
-@click.option("--name", default=None)
-@click.option("--label", default=None)
-@click.option("--trial_period", type=int, default=None)
-@click.option("--description", default=None)
-@click.option("--product-price-id", default=None, multiple=True)
-@click.option("--remove-product-price-id", default=None, multiple=True)
-@click.pass_context
-def update_product(ctx, product_price_id, remove_product_price_id, **kwargs):
-    product = billing.update_product(
-        ctx,
-        remove_product_price_ids=list(remove_product_price_id),
-        product_price_ids=list(product_price_id),
-        **kwargs,
-    )
-    output_entry(ctx, product.to_dict())
-
-
 @cli.command(name="show-launcher")
 @click.argument("id")
 @click.option("--org-id", default=None)
@@ -7739,6 +7680,7 @@ def main():
     hosts_main.add_commands(cli)
     labels_main.add_commands(cli)
     rules_main.add_commands(cli)
+    products_main.add_commands(cli)
     credentials_main.add_commands(cli)
     cli(auto_envvar_prefix="AGILICUS")
 

agilicus/products/products.py

@@ -0,0 +1,158 @@
+from ..context import get_apiclient_from_ctx
+import agilicus
+import operator
+from ..output.table import (
+    column,
+    spec_column,
+    metadata_column,
+    format_table,
+    subtable,
+)
+
+
+def get_api(ctx, name, v2=False):
+    client = get_apiclient_from_ctx(ctx)
+    if v2:
+        return getattr(client.products_api, "v2_" + name)
+    return getattr(client.billing_api, name)
+
+
+def list_products(ctx, v2=False, **kwargs):
+    list_products = get_api(ctx, "list_products", v2)
+    products = list_products(**kwargs)
+    products.products = sorted(products.products, key=lambda d: d["spec"]["label"])
+    return products
+
+
+def format_products(ctx, products_obj):
+    products = products_obj.to_dict()
+
+    def get_product_name(record, key):
+        return "{0: <20}".format(record["product"]["name"])
+
+    def get_product_nickname(record, key):
+        return "{0: <28}".format(record["nickname"])
+
+    def get_product_metric(record, key):
+        if "metric" in record["product"]["metadata"]:
+            return "{0: <20}".format(record["product"]["metadata"]["metric"])
+        else:
+            return "{0: <20}".format("")
+
+    def get_unit_amount(record, key):
+        if record["unit_amount"]:
+            return "{:,.2f}".format(record["unit_amount"] / 100)
+        return ""
+
+    product_price_column = [
+        column("id", optional=True),
+        column("product name", getter=get_product_name, optional=True),
+        column("nickname", getter=get_product_nickname, optional=True),
+        column("metric", getter=get_product_metric, optional=True),
+        column("unit_amount", getter=get_unit_amount, optional=True),
+    ]
+    columns = [
+        metadata_column("id"),
+        spec_column("name"),
+        spec_column("label", optional=True),
+        spec_column("description", optional=True),
+        spec_column("trial_period", optional=True),
+        #        spec_column("dev_mode", optional=True),
+        subtable(
+            ctx,
+            "billing_product_prices",
+            product_price_column,
+            table_getter=operator.itemgetter,
+            subobject_name="status",
+            optional=True,
+        ),
+    ]
+    return format_table(
+        ctx, products.get("products"), columns, getter=operator.itemgetter
+    )
+
+
+def add_product(
+    ctx,
+    name=None,
+    dev_mode=None,
+    trial_period=None,
+    product_price_ids=[],
+    v2=False,
+    **kwargs,
+):
+    create_product = get_api(ctx, "create_product", v2)
+    prices = []
+    for price_id in product_price_ids:
+        prices.append(agilicus.BillingProductPrice(id=price_id))
+    spec = agilicus.ProductSpec(name=name, billing_product_prices=prices, **kwargs)
+
+    if dev_mode is not None:
+        spec.dev_mode = dev_mode
+    if trial_period is not None:
+        spec.trial_period = trial_period
+
+    product = agilicus.Product(spec=spec)
+
+    return create_product(product)
+
+
+def delete_product(ctx, product_id=None, v2=False, **kwargs):
+    delete_product = get_api(ctx, "delete_product", v2)
+    return delete_product(product_id)
+
+
+def get_product(ctx, product_id=None, v2=False, **kwargs):
+    get_product = get_api(ctx, "get_product", v2)
+    return get_product(product_id)
+
+
+def update_product(
+    ctx,
+    product_id=None,
+    dev_mode=None,
+    name=None,
+    product_price_ids=None,
+    remove_product_price_ids=None,
+    label=None,
+    description=None,
+    trial_period=None,
+    v2=False,
+    **kwargs,
+):
+    get_product = get_api(ctx, "get_product", v2)
+
+    product = get_product(product_id)
+
+    if remove_product_price_ids is not None:
+        old_prices = product.spec.billing_product_prices
+        product.spec.billing_product_prices = []
+        for price in old_prices:
+            if price.id in remove_product_price_ids:
+                # needs to be removed.
+                continue
+            product.spec.billing_product_prices.append(price)
+
+    if product_price_ids is not None:
+        for price_id in product_price_ids:
+            product.spec.billing_product_prices.append(
+                agilicus.BillingProductPrice(id=price_id)
+            )
+
+    if dev_mode is not None:
+        product.spec.dev_mode = dev_mode
+    if name is not None:
+        product.spec.name = name
+    if description is not None:
+        product.spec.description = description
+    if label is not None:
+        product.spec.label = label
+    if trial_period is not None:
+        product.spec.trial_period = trial_period
+
+    replace_product = get_api(ctx, "replace_product", v2)
+
+    return replace_product(
+        product_id,
+        product=product,
+    )

agilicus/products/products_main.py

@@ -0,0 +1,77 @@
+import click
+from . import products
+from ..output.table import output_entry
+
+
+@click.command(name="list-products")
+@click.option("--limit", default=500)
+@click.option("--get-subscription-data", is_flag=True, default=False)
+@click.option("--v2", is_flag=True, default=False)
+@click.pass_context
+def cli_command_list_products(ctx, **kwargs):
+    results = products.list_products(ctx, **kwargs)
+    table = products.format_products(ctx, results)
+    print(table)
+
+
+@click.command(name="add-product")
+@click.argument("name")
+@click.option("--product-price-id", default=None, multiple=True)
+@click.option("--dev-mode", is_flag=True, default=None)
+@click.option("--label", default=None)
+@click.option("--description", default=None)
+@click.option("--trial_period", type=int, default=None)
+@click.option("--v2", is_flag=True, default=False)
+@click.pass_context
+def cli_command_add_product(ctx, product_price_id, **kwargs):
+    result = products.add_product(
+        ctx, product_price_ids=list(product_price_id), **kwargs
+    )
+    output_entry(ctx, result.to_dict())
+
+
+@click.command(name="delete-product")
+@click.argument("product-id")
+@click.option("--v2", is_flag=True, default=False)
+@click.pass_context
+def cli_command_delete_product(ctx, **kwargs):
+    products.delete_product(ctx, **kwargs)
+
+
+@click.command(name="show-product")
+@click.argument("product_id")
+@click.option("--v2", is_flag=True, default=False)
+@click.pass_context
+def cli_command_show_product(ctx, **kwargs):
+    result = products.get_product(ctx, **kwargs)
+    output_entry(ctx, result.to_dict())
+
+
+@click.command(name="update-product")
+@click.argument("product_id")
+@click.option("--dev-mode", is_flag=True, default=None)
+@click.option("--name", default=None)
+@click.option("--label", default=None)
+@click.option("--trial_period", type=int, default=None)
+@click.option("--description", default=None)
+@click.option("--product-price-id", default=None, multiple=True)
+@click.option("--remove-product-price-id", default=None, multiple=True)
+@click.option("--v2", is_flag=True, default=False)
+@click.pass_context
+def cli_command_update_product(ctx, product_price_id, remove_product_price_id, **kwargs):
+    result = products.update_product(
+        ctx,
+        remove_product_price_ids=list(remove_product_price_id),
+        product_price_ids=list(product_price_id),
+        **kwargs,
+    )
+    output_entry(ctx, result.to_dict())
+
+
+all_funcs = [func for func in dir() if "cli_command_" in func]
+
+
+def add_commands(cli):
+    glob = globals()
+    for func in all_funcs:
+        cli.add_command(glob[func])

{agilicus-1.234.0.dist-info → agilicus-1.234.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: agilicus
-Version: 1.234.0
+Version: 1.234.1
 Summary: Agilicus SDK
 Home-page: https://www.agilicus.com/
 License: MIT