agilicus 1.402.0__py3-none-any.whl → 1.403.10__py3-none-any.whl

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: 2025.12.11
+    The version of the OpenAPI document: 2026.01.15
     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: 2025.12.11
+    The version of the OpenAPI document: 2026.01.15
     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: 2025.12.11
+    The version of the OpenAPI document: 2026.01.15
     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: 2025.12.11
+    The version of the OpenAPI document: 2026.01.15
     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: 2025.12.11
-- Package version: 1.402.0
+- API version: 2026.01.15
+- Package version: 1.403.10
 - Build package: org.openapitools.codegen.languages.PythonClientCodegen
 For more information, please visit [https://www.agilicus.com/api](https://www.agilicus.com/api)
 
@@ -943,6 +943,7 @@ Class | Method | HTTP request | Description
  - [AgentConnectorTransportStats](agilicus_api/docs/AgentConnectorTransportStats.md)
  - [AgentConnectorTunnelInfo](agilicus_api/docs/AgentConnectorTunnelInfo.md)
  - [AgentConnectorTunneling](agilicus_api/docs/AgentConnectorTunneling.md)
+ - [AgentConnectorUpstreamBufferStats](agilicus_api/docs/AgentConnectorUpstreamBufferStats.md)
  - [AgentConnectorUserStats](agilicus_api/docs/AgentConnectorUserStats.md)
  - [AgentLocalAuthInfo](agilicus_api/docs/AgentLocalAuthInfo.md)
  - [AllowMapCompiled](agilicus_api/docs/AllowMapCompiled.md)
@@ -1081,6 +1082,7 @@ Class | Method | HTTP request | Description
  - [ConnectorBaseInfoMap](agilicus_api/docs/ConnectorBaseInfoMap.md)
  - [ConnectorCloudRouting](agilicus_api/docs/ConnectorCloudRouting.md)
  - [ConnectorDiagnosticStats](agilicus_api/docs/ConnectorDiagnosticStats.md)
+ - [ConnectorForwarderStatsPublish](agilicus_api/docs/ConnectorForwarderStatsPublish.md)
  - [ConnectorInstance](agilicus_api/docs/ConnectorInstance.md)
  - [ConnectorInstanceSpec](agilicus_api/docs/ConnectorInstanceSpec.md)
  - [ConnectorInstanceStatus](agilicus_api/docs/ConnectorInstanceStatus.md)
@@ -1122,6 +1124,7 @@ Class | Method | HTTP request | Description
  - [DeploymentInstanceResource](agilicus_api/docs/DeploymentInstanceResource.md)
  - [DeploymentInstanceSpec](agilicus_api/docs/DeploymentInstanceSpec.md)
  - [DeploymentInstanceStatus](agilicus_api/docs/DeploymentInstanceStatus.md)
+ - [DeploymentOutput](agilicus_api/docs/DeploymentOutput.md)
  - [DeploymentParameter](agilicus_api/docs/DeploymentParameter.md)
  - [DeploymentResolvedSchema](agilicus_api/docs/DeploymentResolvedSchema.md)
  - [DeploymentSpec](agilicus_api/docs/DeploymentSpec.md)
@@ -1189,6 +1192,10 @@ Class | Method | HTTP request | Description
  - [FileVisibility](agilicus_api/docs/FileVisibility.md)
  - [FormInjection](agilicus_api/docs/FormInjection.md)
  - [FormInjectionConfig](agilicus_api/docs/FormInjectionConfig.md)
+ - [ForwarderCommonStats](agilicus_api/docs/ForwarderCommonStats.md)
+ - [ForwarderDetailedStats](agilicus_api/docs/ForwarderDetailedStats.md)
+ - [ForwarderStatsPublish](agilicus_api/docs/ForwarderStatsPublish.md)
+ - [ForwarderSummaryStats](agilicus_api/docs/ForwarderSummaryStats.md)
  - [FrameOptionsSettings](agilicus_api/docs/FrameOptionsSettings.md)
  - [GenericFloatMetric](agilicus_api/docs/GenericFloatMetric.md)
  - [GenericIntMetric](agilicus_api/docs/GenericIntMetric.md)
@@ -1536,6 +1543,7 @@ Class | Method | HTTP request | Description
  - [PageAtKey](agilicus_api/docs/PageAtKey.md)
  - [PageInfo](agilicus_api/docs/PageInfo.md)
  - [PageOn](agilicus_api/docs/PageOn.md)
+ - [PerInstanceForwarderStats](agilicus_api/docs/PerInstanceForwarderStats.md)
  - [PerInstanceUpstreamStats](agilicus_api/docs/PerInstanceUpstreamStats.md)
  - [PerTunnelStats](agilicus_api/docs/PerTunnelStats.md)
  - [PermittedCrossDomainPoliciesSettings](agilicus_api/docs/PermittedCrossDomainPoliciesSettings.md)
@@ -1756,6 +1764,7 @@ Class | Method | HTTP request | Description
  - [UpstreamAlias](agilicus_api/docs/UpstreamAlias.md)
  - [UpstreamAliasMapping](agilicus_api/docs/UpstreamAliasMapping.md)
  - [UpstreamAliasSpec](agilicus_api/docs/UpstreamAliasSpec.md)
+ - [UpstreamBufferControl](agilicus_api/docs/UpstreamBufferControl.md)
  - [UpstreamGroupExcludedEntry](agilicus_api/docs/UpstreamGroupExcludedEntry.md)
  - [UpstreamGroupMapping](agilicus_api/docs/UpstreamGroupMapping.md)
  - [UpstreamGroupMappingEntry](agilicus_api/docs/UpstreamGroupMappingEntry.md)

agilicus/apps.py

@@ -1163,7 +1163,7 @@ def update_application_service(  # noqa: C901
 
     service.config = configure_port(service.config, port_range)
     if source_port_override is not None:
-        service.config.source_port_override = source_port_override
+        service.config.source_port_override = parse_ports(source_port_override)
     if source_address_override is not None:
         service.config.source_address_override = source_address_override
     if dynamic_source_port_override is not None:

agilicus/connectors.py

@@ -681,6 +681,7 @@ def replace_agent(
     revocation_proxy_rules_bundle_id=None,
     ntp_forwarding_bind=None,
     ntp_forwarding_custom_bind=None,
+    sync_local_clock=None,
     **kwargs,
 ):
     token = context.get_token(ctx)
@@ -724,10 +725,13 @@ def replace_agent(
             cloud_routing.point_of_presence_tags = tags
 
         connector.spec.cloud_routing = cloud_routing
+
     _update_tunneling(
         connector, dynamic_routes_enabled, on_demand_routes_enabled, ntp_forwarding_bind
     )
-    _update_ntp_forwarding(connector, ntp_forwarding_bind, ntp_forwarding_custom_bind)
+    _update_ntp_forwarding(
+        connector, ntp_forwarding_bind, ntp_forwarding_custom_bind, sync_local_clock
+    )
 
     if admin_status is not None:
         connector.spec.admin_status = admin_status
@@ -749,13 +753,19 @@ def replace_agent(
     return _replace_agent(apiclient, connector_id=connector_id, connector=connector)
 
 
-def _update_ntp_forwarding(connector, ntp_forwarding_bind, custom_bind):
+def _update_ntp_forwarding(
+    connector, ntp_forwarding_bind, custom_bind, sync_local_clock
+):
+    routing = connector.spec.routing
+    if sync_local_clock is not None:
+        if routing is None:
+            routing = agilicus.AgentConnectorCloudRouting(local_binds=[])
+        connector.spec.routing = routing
+        if sync_local_clock is not None:
+            connector.spec.routing.sync_local_clock = sync_local_clock
+
     if ntp_forwarding_bind is None:
         return
-    routing = connector.spec.routing
-    if routing is None:
-        routing = agilicus.AgentConnectorCloudRouting(local_binds=[])
-    connector.spec.routing = routing
 
     internal_networks = routing.internal_networks
     if not internal_networks:
@@ -878,6 +888,7 @@ def show_agent_connector_stats(ctx, connector_id, **kwargs):
 
         instance_stats.append(stats)
         headings.append(instance.status.name)
+    num_cols = len(results)
 
     table = PrettyTable(headings)
 
@@ -887,8 +898,9 @@ def show_agent_connector_stats(ctx, connector_id, **kwargs):
             add_table_stats_rows(instancesStats, stat, value)
     for stat, entries in instancesStats.items():
         row = []
+        print(f"stat={stat}, entries={entries}")
         row.append(stat)
-        row.extend(entries)
+        row.extend(entries[:num_cols] + [""] * (num_cols - len(entries)))
         table.add_row(row)
     table.align = "l"
     print(table)
@@ -910,9 +922,12 @@ def show_agent_connector_dynamic_stats(
     table = PrettyTable(headings)
     table.add_row(("last_updated", stats.metadata.collection_time))
     stat_rows = _collate_upstream_stats(ctx, stats.upstream_totals, detailed)
+    stat_rows.extend(_collate_forwarder_stats(ctx, stats.forwarder_totals, detailed))
     to_add_breakdown = []
+    to_add_forwarder_breakdown = []
     if breakdown:
         to_add_breakdown = stats.upstream_breakdown
+        to_add_forwarder_breakdown = stats.forwarder_breakdown
 
     for item in to_add_breakdown:
         prefix = [item.connector_instance_id, item.application_service_id]
@@ -920,6 +935,11 @@ def show_agent_connector_dynamic_stats(
             _collate_upstream_stats(ctx, item.upstream_stats, detailed, prefix)
         )
 
+    for item in to_add_forwarder_breakdown:
+        prefix = [item.connector_instance_id, item.forwarder_id]
+        stat_rows.extend(
+            _collate_forwarder_stats(ctx, item.forwarder_stats, detailed, prefix)
+        )
     for stat, val in stat_rows:
         row = []
         row.append(stat)
@@ -1025,14 +1045,36 @@ def _collate_upstream_stats(ctx, upstream_stats, detailed, name_prefix=None):
     return results
 
 
-def _collate_stats_object(ctx, stats_obj, name_prefix=None):
+def _collate_forwarder_stats(ctx, forwarder_stats, detailed, name_prefix=None):
+    results = []
+    forwarder_stats = forwarder_stats.to_dict()
+    summary = forwarder_stats.get("forwarder_summary_stats")
+
+    def remap(name):
+        return "forwarder_" + name
+
+    results.extend(
+        _collate_stats_object(ctx, summary, name_prefix=name_prefix, name_remap=remap)
+    )
+
+    if not detailed:
+        return results
+
+    detailed = forwarder_stats.get("forwarder_detailed_stats")
+    results.extend(
+        _collate_stats_object(ctx, detailed, name_prefix=name_prefix, name_remap=remap)
+    )
+    return results
+
+
+def _collate_stats_object(ctx, stats_obj, name_prefix=None, name_remap=lambda x: x):
     if not stats_obj:
         return []
     results = []
     if name_prefix is None:
         name_prefix = []
     for key, val in stats_obj.items():
-        name = name_prefix + [key]
+        name = name_prefix + [name_remap(key)]
         if isinstance(val, dict):
             results.extend(_collate_stats_object(ctx, val, name))
             continue
@@ -1357,6 +1399,8 @@ def configure_stats_publishing(
     http_detailed_duration_s,
     share_summary_duration_s,
     share_detailed_duration_s,
+    forwarder_summary_duration_s,
+    forwarder_detailed_duration_s,
 ):
     token = context.get_token(ctx)
     apiclient = context.get_apiclient(ctx, token)
@@ -1365,6 +1409,7 @@ def configure_stats_publishing(
     net = agilicus_api.StatsPublishingLevelConfig()
     http = agilicus_api.StatsPublishingLevelConfig()
     share = agilicus_api.StatsPublishingLevelConfig()
+    forwarder = agilicus_api.StatsPublishingLevelConfig()
 
     if net_summary_duration_s:
         net.summary_duration_seconds = net_summary_duration_s
@@ -1378,11 +1423,16 @@ def configure_stats_publishing(
         share.summary_duration_seconds = share_summary_duration_s
     if share_detailed_duration_s:
         share.detailed_duration_seconds = share_detailed_duration_s
+    if forwarder_summary_duration_s:
+        forwarder.summary_duration_seconds = forwarder_summary_duration_s
+    if forwarder_detailed_duration_s:
+        forwarder.detailed_duration_seconds = forwarder_detailed_duration_s
 
     cfg = agilicus_api.StatsPublishingConfig(
         upstream_network_publishing=net,
         upstream_http_publishing=http,
         upstream_share_publishing=share,
+        forwarder_publishing=forwarder,
         publish_period_seconds=publish_period_s,
     )
     req = agilicus_api.ConfigureConnectorStatsPublishingRequest(

agilicus/deployments/deployments.py

@@ -109,14 +109,15 @@ def get_deployment_template(ctx, deployment_template_id, **kwargs):
 def add_deployment_template(ctx, template, **kwargs):
     with open(template, "r") as file:
         config_data = yaml.safe_load(file)
-        add_deployment_template_from_dict(ctx, config_data, **kwargs)
+        return add_deployment_template_from_dict(ctx, config_data, **kwargs)
 
 
 def add_deployment_template_from_dict(ctx, template, **kwargs):
-    pop_item_if_none(kwargs)
     token = context.get_token(ctx)
     update_org_from_input_or_ctx(kwargs, ctx, **kwargs)
     apiclient = context.get_apiclient(ctx, token)
+    kwargs["description"] = template.get("description")
+    pop_item_if_none(kwargs)
 
     deployment_template = agilicus.DeploymentTemplate(
         agilicus.DeploymentTemplateSpec(**kwargs, template=template)

agilicus/deployments/deployments_main.py

@@ -24,6 +24,7 @@ def cli_command_list_deployments(ctx, **kwargs):
           - status.parameters:
             - name
             - type
+            - default
           - status.schema_errors
         """,
     )
@@ -62,8 +63,10 @@ def cli_command_add_deployment(ctx, **kwargs):
 @cmd.command(name="list-deployment-instances")
 @click.option("--limit", default=500)
 @click.option("--org-id", default=None)
+@click.option("--show-columns", type=str, default=None)
+@click.option("--reset-columns", is_flag=True, default=False)
 @click.pass_context
-def cli_command_list_deployment_instances(ctx, **kwargs):
+def cli_command_list_deployment_instances(ctx, show_columns, reset_columns, **kwargs):
     results = deployments.list_deployment_instances(ctx, **kwargs)
     columns = make_columns(
         ctx,
@@ -71,9 +74,6 @@ def cli_command_list_deployment_instances(ctx, **kwargs):
         """
           - metadata.id(newname=id)
           - spec.name(newname=name)
-          - spec.inputs:
-            - name
-            - value_as_string
           - status.status
           - status.resources:
             - template_name
@@ -82,6 +82,8 @@ def cli_command_list_deployment_instances(ctx, **kwargs):
             - type
             - shared
         """,
+        show=show_columns,
+        clear=reset_columns,
     )
     print(format_table(ctx, results, columns))
 
@@ -121,6 +123,7 @@ def cli_command_list_deployment_templates(ctx, **kwargs):
           - spec.org_id(newname=org_id)
           - spec.name(newname=name)
           - spec.template_type(newname=template_type)
+          - spec.description(newname=description)
         """,
     )
     print(format_table(ctx, results, columns))

agilicus/main.py

@@ -5415,6 +5415,8 @@ def update_connector(ctx, **kwargs):
 @click.option("--http-detailed-duration-s", type=int, default=None)
 @click.option("--share-summary-duration-s", type=int, default=None)
 @click.option("--share-detailed-duration-s", type=int, default=None)
+@click.option("--forwarder-summary-duration-s", type=int, default=None)
+@click.option("--forwarder-detailed-duration-s", type=int, default=None)
 @click.pass_context
 def configure_connector_stats_publishing(ctx, **kwargs):
     result = connectors.configure_stats_publishing(ctx, **kwargs)
@@ -5664,6 +5666,7 @@ def show_agent_connector_info(ctx, connector_id, **kwargs):
     type=click.Choice(connectors.INTERNAL_SERVICE_BIND),
 )
 @click.option("--ntp-forwarding-custom-bind", default=None, type=str)
+@click.option("--sync-local-clock", default=None, type=bool)
 @click.pass_context
 def update_agent_connector(ctx, connector_id, **kwargs):
     result = connectors.replace_agent(ctx, connector_id, **kwargs)

agilicus/output/column_builder.py

@@ -29,7 +29,10 @@ class ColumnBuilder:
             found = m.group(2)
             for option in found.split(","):
                 split_str = option.split("=")
-                all_options[split_str[0]] = split_str[1]
+                if split_str[1] == "true" or split_str[1] == "false":
+                    all_options[split_str[0]] = bool(split_str[1])
+                else:
+                    all_options[split_str[0]] = split_str[1]
             table_name = m.group(1)
         columns = self.build_columns(format_doc, subtable_column_name=table_name)
         return table.subtable(
@@ -48,7 +51,9 @@ class ColumnBuilder:
             for option in found.split(","):
                 split_str = option.split("=")
                 all_options[split_str[0]] = split_str[1]
-            return table.column(m.group(1), optional=True, **all_options)
+            if all_options.get("optional") is None:
+                all_options["optional"] = True
+            return table.column(m.group(1), **all_options)
         return table.column(column_name, optional=True)
 
     def build_columns(

agilicus/output/table.py

@@ -42,6 +42,11 @@ def date_else_identity(input_obj, ctx=None):
             else:
                 list_as_str += f"- {obj}\n"
         return list_as_str
+    elif isinstance(input_obj, dict):
+        list_as_str = ""
+        for k, v in input_obj.items():
+            list_as_str += f"{k}: {v}\n"
+        return list_as_str
     return input_obj
 
 
@@ -66,9 +71,12 @@ class OutputColumn:
     format_fn: Callable = date_else_identity
     getter: Callable = None
     optional: bool = False
+    itemgetter: bool = False
 
 
-def column(name, newname=None, optional=False, getter=None, format_fn=None):
+def column(
+    name, newname=None, optional=False, getter=None, format_fn=None, itemgetter=False
+):
     out_name = newname
     if not out_name:
         out_name = name
@@ -80,6 +88,7 @@ def column(name, newname=None, optional=False, getter=None, format_fn=None):
         optional=optional,
         getter=getter,
         format_fn=format_fn,
+        itemgetter=itemgetter,
     )
 
 
@@ -95,6 +104,7 @@ def subtable(
     subobject_name=None,
     table_getter=operator.attrgetter,
     optional=False,
+    itemgetter=False,
 ):
     if not out_name:
         out_name = in_name
@@ -120,6 +130,7 @@ def subtable(
         format_fn=format_fn,
         getter=col_getter,
         optional=optional,
+        itemgetter=itemgetter,
     )
 
 
@@ -335,7 +346,7 @@ def get_table_style(ctx):
     return table_style
 
 
-def format_table(
+def format_table(  # noqa
     ctx,
     records,
     columns,
@@ -365,7 +376,14 @@ def format_table(
                 continue
         for column in columns:
             in_value = None
-            if column.getter:
+            out_value = "---"
+            if column.itemgetter:
+                try:
+                    in_value = operator.itemgetter(column.in_name)(record)
+                except Exception as exc:
+                    if not column.optional:
+                        raise exc
+            elif column.getter:
                 try:
                     in_value = column.getter(record, getter)
                 except Exception as exc:
@@ -378,7 +396,6 @@ def format_table(
                     if not column.optional:
                         raise exc
 
-            out_value = "---"
             if in_value is not None:
                 out_value = column.format_fn(in_value, ctx=ctx)
             row.append(out_value)

agilicus/trusted_certs/trusted_certs.py

@@ -1,8 +1,13 @@
 from .. import context
+from datetime import date
 import json
 from ..input_helpers import get_org_from_input_or_ctx, strip_none
 import agilicus
 import pem
+from cryptography.hazmat.backends import default_backend
+from cryptography import x509
+from cryptography.hazmat.primitives import serialization
+import httpx
 from ..output.table import (
     spec_column,
     format_table,
@@ -13,43 +18,95 @@ from ..output.table import (
 )
 
 
-def add_certificate(ctx, labels, certificate, **kwargs):
-    token = context.get_token(ctx)
-    apiclient = context.get_apiclient(ctx, token)
+def add_certificate(ctx, certificate=None, certificate_url=None, **kwargs):
+    results = []
+    if certificate:
+        for certificate in pem.parse_file(certificate):
+            results.append(_add_certificate_pem(ctx, str(certificate), **kwargs))
+    if certificate_url:
+        response = httpx.get(certificate_url)
+        if response.status_code != 200:
+            return results
+        crt_data = response.content
+        cert = x509.load_der_x509_certificate(crt_data, default_backend())
+        pem_data = cert.public_bytes(serialization.Encoding.PEM).decode()
+        results.append(_add_certificate_pem(ctx, str(pem_data), **kwargs))
+    return results
+
 
+def _add_certificate_pem(ctx, certificate, labels, **kwargs):
+    token = context.get_token(ctx)
     org_id = get_org_from_input_or_ctx(ctx, **kwargs)
     kwargs["org_id"] = org_id
 
+    apiclient = context.get_apiclient(ctx, token)
+    spec = agilicus.TrustedCertificateSpec(str(certificate), **kwargs)
+    if labels:
+        spec.labels = [agilicus.TrustedCertificateLabelName(label) for label in labels]
+    req = agilicus.TrustedCertificate(spec=spec)
+
+    try:
+        return apiclient.trusted_certs_api.create_trusted_cert(req)
+    except Exception as exc:
+        if exc.status == 409:
+            body = exc.body
+            if not body:
+                raise
+            result = json.loads(body)
+            guid = agilicus.find_guid(result)
+            req = apiclient.trusted_certs_api.get_trusted_cert(guid, org_id=org_id)
+            req.spec.certificate = str(certificate)
+            if not req.spec.labels:
+                req.spec.labels = []
+            for label in labels:
+                req.spec.labels.append(agilicus.TrustedCertificateLabelName(label))
+            updated_cert = apiclient.trusted_certs_api.replace_trusted_cert(
+                req.metadata.id,
+                req,
+            )
+            return updated_cert
+        raise
+
+
+def globalsize_get_cert_url(common_name):
+    url = ""
+    mappings = {"GlobalSign": "gs"}
+    if "GlobalSign" not in common_name:
+        return None
+
+    for part in common_name.split(" "):
+        url += mappings.get(part, part.lower())
+    return f"https://secure.globalsign.com/cacert/{url}.crt"
+
+
+def get_globalsign_urls(**kwargs):
+    base = "https://secure.globalsign.com/cacert/gsatlasr3dvtlsca"
+    year = date.today().year
+    urls = []
+    for year in [year, year + 1]:
+        url = base + str(year)
+
+        for q in range(1, 5):
+            urls.append(url + f"q{str(q)}.crt")
+    return urls
+
+
+def update_globalsign_certs(ctx, **kwargs):
+    results = []
+    for url in get_globalsign_urls():
+        results.extend(add_certificate(ctx, certificate_url=url, labels=["all"]))
+    return results
+
+
+def update_trusted_certificates(ctx, common_name=None, globalsign=None, **kwargs):
     results = []
-    for certificate in pem.parse_file(certificate):
-        spec = agilicus.TrustedCertificateSpec(str(certificate), **kwargs)
-        if labels:
-            spec.labels = [
-                agilicus.TrustedCertificateLabelName(label) for label in labels
-            ]
-        req = agilicus.TrustedCertificate(spec=spec)
-
-        try:
-            created_cert = apiclient.trusted_certs_api.create_trusted_cert(req)
-            results.append(created_cert)
-        except Exception as exc:
-            if exc.status == 409:
-                body = exc.body
-                if not body:
-                    raise
-                result = json.loads(body)
-                guid = agilicus.find_guid(result)
-                req = apiclient.trusted_certs_api.get_trusted_cert(guid, org_id=org_id)
-                req.spec.certificate = str(certificate)
-                if not req.spec.labels:
-                    req.spec.labels = []
-                for label in labels:
-                    req.spec.labels.append(agilicus.TrustedCertificateLabelName(label))
-                updated_cert = apiclient.trusted_certs_api.replace_trusted_cert(
-                    req.metadata.id,
-                    req,
-                )
-                results.append(updated_cert)
+    if globalsign:
+        results.extend(update_globalsign_certs(ctx, **kwargs))
+    if common_name:
+        url = globalsize_get_cert_url(common_name)
+        if not url:
+            return "cannot find cert url from CN"
+        return add_certificate(ctx, certificate_url=url, labels=["all"], **kwargs)
     return results
 
 

agilicus/trusted_certs/trusted_certs_main.py

@@ -4,13 +4,16 @@ from . import trusted_certs
 
 
 @click.command(name="add-trusted-certificate")
-@click.argument("certificate", nargs=-1, type=click.Path(exists=True))
+@click.option("--certificate", multiple=True, type=click.Path(exists=True))
+@click.option("--certificate-url", multiple=True)
 @click.option("--root", is_flag=True)
 @click.option("--label", type=str, multiple=True)
 @click.option("--org-id", default=None)
 @click.option("--quiet", default=True)
 @click.pass_context
-def cli_command_add_trusted_certificate(ctx, certificate, label, quiet, **kwargs):
+def cli_command_add_trusted_certificate(
+    ctx, certificate, certificate_url, label, quiet, **kwargs
+):
     for cert in certificate:
         results = trusted_certs.add_certificate(
             ctx, certificate=cert, labels=list(label), **kwargs
@@ -19,6 +22,27 @@ def cli_command_add_trusted_certificate(ctx, certificate, label, quiet, **kwargs
             continue
         for result in results:
             output_entry(ctx, result.to_dict())
+    for url in certificate_url:
+        results = trusted_certs.add_certificate(
+            ctx, certificate_url=url, labels=list(label), **kwargs
+        )
+        if quiet:
+            continue
+        for result in results:
+            output_entry(ctx, result.to_dict())
+
+
+@click.command(name="update-trusted-certificates")
+@click.option("--globalsign", is_flag=True, default=False)
+@click.option("--common-name", default=None)
+@click.pass_context
+def cli_command_update_trusted_certificates(ctx, **kwargs):
+    if not ctx.obj.get("ADMIN_MODE"):
+        print("must run in --admin mode")
+        return
+    results = trusted_certs.update_trusted_certificates(ctx, **kwargs)
+    for result in results:
+        output_entry(ctx, result.to_dict())
 
 
 @click.command(name="show-trusted-certificate")