From 1f75af561deae2c29c10eb44ae2c1cbf0d7208b7 Mon Sep 17 00:00:00 2001 From: OCI DEX Release Bot Automation Date: Tue, 5 Nov 2024 10:23:15 +0000 Subject: [PATCH] Releasing version 3.50.0 Co-authored-by: Harsh Kumar --- CHANGELOG.rst | 46 ++ requirements.txt | 2 +- .../src/oci_cli_cims/support_cli_extended.py | 4 - .../generated/incident_cli.py | 140 ++---- .../tests/util/generated/command_to_api.py | 2 - .../generated/dataflow_cli.py | 166 ++++++- .../tests/util/generated/command_to_api.py | 2 + .../generated/identitydomains_cli.py | 416 +++++++++++++++--- .../tests/util/generated/command_to_api.py | 4 + .../integration_cli_extended.py | 4 +- setup.py | 2 +- src/oci_cli/version.py | 2 +- tests/resources/json_ignore_command_list.txt | 5 + 13 files changed, 597 insertions(+), 198 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d77e461f2..67a368722 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,52 @@ All notable changes to this project will be documented in this file. The format is based on `Keep a Changelog `__. +3.50.0 - 2024-11-05 +-------------------- +Changed +~~~~~~~ +* [BREAKING] Cloud Incident Management Service + + * Optional parameter --compartment-id is now a required parameter for the below commands + + * ``oci support incident get`` + * ``oci support incident update`` + +Added +~~~~~ +* Support for calling Oracle Cloud Infrastructure services in the ap-seoul-2 region + +* Support for calling Oracle Cloud Infrastructure services in the ap-suwon-1 region + +* Support for calling Oracle Cloud Infrastructure services in the ap-chuncheon-2 region + +* Identity Domains Service + + * Support for MFA Enablement v2 to prevent customers from opting out of MFA Policy in IDCS SSO Service. + + * ``oci identity-domains oci-console-sign-on-policy-consent list`` + * ``oci identity-domains oci-console-sign-on-policy-consent get`` + * ``oci identity-domains oci-console-sign-on-policy-consent search`` + * ``oci identity-domains restore-oci-console-policy create`` + +* Data Flow Service + + * Support to start/stop Dataflow SQL Endpoint + + * ``oci data-flow sql-endpoint start`` + * ``oci data-flow sql-endpoint stop`` + + * Support to update min, max executor nodes and spark advanced configuration in Dataflow SQL Endpoint + + * ``oci data-flow sql-endpoint update`` + +Fixed +~~~~~ +* Support for STANDARDX and ENTERPRISEX types of create and update instance subcommands in the Integration service + + * ``oci integration integration-instance create --type STANDARDX | ENTERPRISEX`` + * ``oci integration integration-instance update --type STANDARDX | ENTERPRISEX`` + 3.49.4 - 2024-10-29 -------------------- Added diff --git a/requirements.txt b/requirements.txt index 299b0fb49..eb173e307 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ Jinja2>=3.1.4; python_version >= '3.7' jmespath==0.10.0 ndg-httpsclient==0.4.2 mock==2.0.0 -oci==2.137.1 +oci==2.138.0 packaging==20.2 pluggy==0.13.0 py==1.11.0 diff --git a/services/cims/src/oci_cli_cims/support_cli_extended.py b/services/cims/src/oci_cli_cims/support_cli_extended.py index 19e13d35c..aae9e52f7 100644 --- a/services/cims/src/oci_cli_cims/support_cli_extended.py +++ b/services/cims/src/oci_cli_cims/support_cli_extended.py @@ -4,9 +4,5 @@ from services.cims.src.oci_cli_incident.generated import incident_cli -# Remove the cli command: oci support status -incident_cli.support_root_group.commands.pop(incident_cli.status_group.name) -# Remove the cli command: oci support string -incident_cli.support_root_group.commands.pop(incident_cli.string_group.name) # Remove the cli command: oci support update-incident incident_cli.support_root_group.commands.pop(incident_cli.update_incident_group.name) diff --git a/services/cims/src/oci_cli_incident/generated/incident_cli.py b/services/cims/src/oci_cli_incident/generated/incident_cli.py index a678757e1..4f0c5024c 100644 --- a/services/cims/src/oci_cli_incident/generated/incident_cli.py +++ b/services/cims/src/oci_cli_incident/generated/incident_cli.py @@ -51,41 +51,27 @@ def incident_group(): pass -@click.command(cli_util.override('support.status_group.command_name', 'status'), cls=CommandGroupWithAlias, help="""Details about the status of the support ticket.""") -@cli_util.help_option_group -def status_group(): - pass - - -@click.command(cli_util.override('support.string_group.command_name', 'string'), cls=CommandGroupWithAlias, help="""""") -@cli_util.help_option_group -def string_group(): - pass - - support_root_group.add_command(update_incident_group) support_root_group.add_command(incident_resource_type_group) support_root_group.add_command(validation_response_group) support_root_group.add_command(incident_group) -support_root_group.add_command(status_group) -support_root_group.add_command(string_group) -@incident_group.command(name=cli_util.override('support.create_incident.command_name', 'create'), help=u"""Operation to create a support ticket. \n[Command Reference](createIncident)""") +@incident_group.command(name=cli_util.override('support.create_incident.command_name', 'create'), help=u"""Creates a support ticket in the specified tenancy. For more information, see [Creating Support Requests]. \n[Command Reference](createIncident)""") @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the tenancy.""") @cli_util.option('--ticket', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) -@cli_util.option('--problem-type', required=True, type=custom_types.CliCaseInsensitiveChoice(["LIMIT", "LEGACY_LIMIT", "TECH", "ACCOUNT", "TAXONOMY"]), help=u"""The kind of support ticket, such as a technical support request or a limit increase request.""") +@cli_util.option('--problem-type', required=True, type=custom_types.CliCaseInsensitiveChoice(["LIMIT", "LEGACY_LIMIT", "TECH", "ACCOUNT", "TAXONOMY"]), help=u"""The kind of support ticket (type of support request). For information about `ACCOUNT` support tickets, see [Creating a Billing Support Request]. For information about `LIMIT` support tickets, see [Creating a Service Limit Increase Request]. For information about `TECH` support tickets, see [Creating a Technical Support Request].""") @cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") @cli_util.option('--contacts', type=custom_types.CLI_COMPLEX_TYPE, help=u"""The list of contacts. This option is a JSON list with items of type Contact. For documentation on Contact please see our API reference: https://docs.cloud.oracle.com/api/#/en/incident/20181231/datatypes/Contact.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--referrer', help=u"""The incident referrer. This value is often the URL that the customer used when creating the support ticket.""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") @cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") @cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") @cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @json_skeleton_utils.get_cli_json_input_option({'ticket': {'module': 'cims', 'class': 'CreateTicketDetails'}, 'contacts': {'module': 'cims', 'class': 'list[Contact]'}}) @cli_util.help_option @click.pass_context @@ -130,62 +116,23 @@ def create_incident(ctx, from_json, compartment_id, ticket, problem_type, csi, c cli_util.render_response(result, ctx) -@string_group.command(name=cli_util.override('support.get_csi_number.command_name', 'get-csi-number'), help=u"""Fetches csi number of the user. \n[Command Reference](getCsiNumber)""") -@cli_util.option('--tenant-id', required=True, help=u"""Tenancy Ocid in oracle cloud Infrastructure""") -@cli_util.option('--region-parameterconflict', required=True, help=u"""Home region of the customer which is part of oracle cloud infrastructure regions""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") -@cli_util.option('--homeregion', help=u"""The region of the tenancy.""") -@cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") -@cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") -@json_skeleton_utils.get_cli_json_input_option({}) -@cli_util.help_option -@click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) -@cli_util.wrap_exceptions -def get_csi_number(ctx, from_json, tenant_id, region_parameterconflict, ocid, homeregion, bearertokentype, bearertoken, idtoken, domainid): - - kwargs = {} - if ocid is not None: - kwargs['ocid'] = ocid - if homeregion is not None: - kwargs['homeregion'] = homeregion - if bearertokentype is not None: - kwargs['bearertokentype'] = bearertokentype - if bearertoken is not None: - kwargs['bearertoken'] = bearertoken - if idtoken is not None: - kwargs['idtoken'] = idtoken - if domainid is not None: - kwargs['domainid'] = domainid - kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id']) - client = cli_util.build_client('cims', 'incident', ctx) - result = client.get_csi_number( - tenant_id=tenant_id, - region=region_parameterconflict, - **kwargs - ) - cli_util.render_response(result, ctx) - - -@incident_group.command(name=cli_util.override('support.get_incident.command_name', 'get'), help=u"""Gets details about the specified support ticket. \n[Command Reference](getIncident)""") +@incident_group.command(name=cli_util.override('support.get_incident.command_name', 'get'), help=u"""Gets the specified support ticket. For more information, see [Getting Details for a Support Request]. \n[Command Reference](getIncident)""") @cli_util.option('--incident-key', required=True, help=u"""Unique identifier for the support ticket.""") -@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) associated with the support account.""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--compartment-id', required=True, help=u"""The OCID of the tenancy.""") +@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") -@cli_util.option('--compartment-id', help=u"""The OCID of the tenancy.""") @cli_util.option('--problemtype', help=u"""The kind of support request.""") @cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") @cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") @cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @json_skeleton_utils.get_cli_json_input_option({}) @cli_util.help_option @click.pass_context @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'cims', 'class': 'Incident'}) @cli_util.wrap_exceptions -def get_incident(ctx, from_json, incident_key, csi, ocid, homeregion, compartment_id, problemtype, bearertokentype, bearertoken, idtoken, domainid): +def get_incident(ctx, from_json, incident_key, compartment_id, csi, ocid, homeregion, problemtype, bearertokentype, bearertoken, idtoken, domainid): if isinstance(incident_key, six.string_types) and len(incident_key.strip()) == 0: raise click.UsageError('Parameter --incident-key cannot be whitespace or empty string') @@ -197,8 +144,6 @@ def get_incident(ctx, from_json, incident_key, csi, ocid, homeregion, compartmen kwargs['ocid'] = ocid if homeregion is not None: kwargs['homeregion'] = homeregion - if compartment_id is not None: - kwargs['compartment_id'] = compartment_id if problemtype is not None: kwargs['problemtype'] = problemtype if bearertokentype is not None: @@ -213,35 +158,13 @@ def get_incident(ctx, from_json, incident_key, csi, ocid, homeregion, compartmen client = cli_util.build_client('cims', 'incident', ctx) result = client.get_incident( incident_key=incident_key, + compartment_id=compartment_id, **kwargs ) cli_util.render_response(result, ctx) -@status_group.command(name=cli_util.override('support.get_status.command_name', 'get'), help=u"""Gets the status of the service. \n[Command Reference](getStatus)""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") -@cli_util.option('--homeregion', help=u"""The region of the tenancy.""") -@json_skeleton_utils.get_cli_json_input_option({}) -@cli_util.help_option -@click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'cims', 'class': 'Status'}) -@cli_util.wrap_exceptions -def get_status(ctx, from_json, ocid, homeregion): - - kwargs = {} - if ocid is not None: - kwargs['ocid'] = ocid - if homeregion is not None: - kwargs['homeregion'] = homeregion - kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id']) - client = cli_util.build_client('cims', 'incident', ctx) - result = client.get_status( - **kwargs - ) - cli_util.render_response(result, ctx) - - -@incident_resource_type_group.command(name=cli_util.override('support.list_incident_resource_types.command_name', 'list'), help=u"""During support ticket creation, returns the list of all possible products that Oracle Cloud Infrastructure supports. \n[Command Reference](listIncidentResourceTypes)""") +@incident_resource_type_group.command(name=cli_util.override('support.list_incident_resource_types.command_name', 'list'), help=u"""Depending on the selected `productType`, either lists available products (service groups, services, service categories, and subcategories) for technical support tickets or lists limits and current usage for limit increase tickets. This operation is called during creation of technical support and limit increase tickets. For more information about listing products, see [Listing Products for Support Requests]. For more information about listing limits, see [Listing Limits for Service Limit Increase Requests]. \n[Command Reference](listIncidentResourceTypes)""") @cli_util.option('--problem-type', required=True, help=u"""The kind of support request.""") @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the tenancy.""") @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of results per page, or items to return in a paginated \"List\" call. For important details about how pagination works, see [List Pagination].""") @@ -249,10 +172,10 @@ def get_status(ctx, from_json, ocid, homeregion): @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["dateUpdated", "severity"]), help=u"""The key to use to sort the returned items.""") @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The order to sort the results in.""") @cli_util.option('--name', help=u"""The user-friendly name of the support ticket type.""") -@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) associated with the support account.""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""") @cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""") @json_skeleton_utils.get_cli_json_input_option({}) @@ -314,21 +237,21 @@ def list_incident_resource_types(ctx, from_json, all_pages, page_size, problem_t cli_util.render_response(result, ctx) -@incident_group.command(name=cli_util.override('support.list_incidents.command_name', 'list'), help=u"""Returns the list of support tickets raised by the tenancy. \n[Command Reference](listIncidents)""") +@incident_group.command(name=cli_util.override('support.list_incidents.command_name', 'list'), help=u"""Lists support tickets for the specified tenancy. For more information, see [Listing Support Requests]. \n[Command Reference](listIncidents)""") @cli_util.option('--compartment-id', required=True, help=u"""The OCID of the tenancy.""") -@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) associated with the support account.""") +@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") @cli_util.option('--limit', type=click.INT, help=u"""For list pagination. The maximum number of results per page, or items to return in a paginated \"List\" call. For important details about how pagination works, see [List Pagination].""") @cli_util.option('--sort-by', type=custom_types.CliCaseInsensitiveChoice(["dateUpdated", "severity"]), help=u"""The key to use to sort the returned items.""") @cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASC", "DESC"]), help=u"""The order to sort the results in.""") @cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["ACTIVE", "CLOSED"]), help=u"""The current state of the ticket.""") @cli_util.option('--page', help=u"""For list pagination. The value of the `opc-next-page` response header from the previous \"List\" call. For important details about how pagination works, see [List Pagination].""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") @cli_util.option('--problem-type', help=u"""The kind of support request.""") @cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") @cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") @cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""") @cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""") @json_skeleton_utils.get_cli_json_input_option({}) @@ -395,26 +318,26 @@ def list_incidents(ctx, from_json, all_pages, page_size, compartment_id, csi, li cli_util.render_response(result, ctx) -@update_incident_group.command(name=cli_util.override('support.update_incident.command_name', 'update-incident'), help=u"""Updates the specified support ticket's information. \n[Command Reference](updateIncident)""") +@update_incident_group.command(name=cli_util.override('support.update_incident.command_name', 'update-incident'), help=u"""Updates the specified support ticket. For more information, see [Updating Support Requests]. \n[Command Reference](updateIncident)""") @cli_util.option('--incident-key', required=True, help=u"""Unique identifier for the support ticket.""") @cli_util.option('--ticket', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) -@cli_util.option('--problem-type', type=custom_types.CliCaseInsensitiveChoice(["LIMIT", "LEGACY_LIMIT", "TECH", "ACCOUNT", "TAXONOMY"]), help=u"""The kind of support ticket, such as a technical support request or a limit increase request.""") -@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) associated with the support account.""") -@cli_util.option('--compartment-id', help=u"""The OCID of the tenancy.""") +@cli_util.option('--compartment-id', required=True, help=u"""The OCID of the tenancy.""") +@cli_util.option('--problem-type', type=custom_types.CliCaseInsensitiveChoice(["LIMIT", "LEGACY_LIMIT", "TECH", "ACCOUNT", "TAXONOMY"]), help=u"""The kind of support ticket (type of support request). For information about `ACCOUNT` support tickets, see [Creating a Billing Support Request]. For information about `LIMIT` support tickets, see [Creating a Service Limit Increase Request]. For information about `TECH` support tickets, see [Creating a Technical Support Request].""") +@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") @cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") @cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") @cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True) @json_skeleton_utils.get_cli_json_input_option({'ticket': {'module': 'cims', 'class': 'UpdateTicketDetails'}}) @cli_util.help_option @click.pass_context @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'ticket': {'module': 'cims', 'class': 'UpdateTicketDetails'}}, output_type={'module': 'cims', 'class': 'Incident'}) @cli_util.wrap_exceptions -def update_incident(ctx, from_json, force, incident_key, ticket, problem_type, csi, compartment_id, if_match, ocid, homeregion, bearertokentype, bearertoken, idtoken, domainid): +def update_incident(ctx, from_json, force, incident_key, ticket, compartment_id, problem_type, csi, if_match, ocid, homeregion, bearertokentype, bearertoken, idtoken, domainid): if isinstance(incident_key, six.string_types) and len(incident_key.strip()) == 0: raise click.UsageError('Parameter --incident-key cannot be whitespace or empty string') @@ -426,8 +349,6 @@ def update_incident(ctx, from_json, force, incident_key, ticket, problem_type, c kwargs = {} if csi is not None: kwargs['csi'] = csi - if compartment_id is not None: - kwargs['compartment_id'] = compartment_id if if_match is not None: kwargs['if_match'] = if_match if ocid is not None: @@ -453,21 +374,22 @@ def update_incident(ctx, from_json, force, incident_key, ticket, problem_type, c client = cli_util.build_client('cims', 'incident', ctx) result = client.update_incident( incident_key=incident_key, + compartment_id=compartment_id, update_incident_details=_details, **kwargs ) cli_util.render_response(result, ctx) -@validation_response_group.command(name=cli_util.override('support.validate_user.command_name', 'validate-user'), help=u"""Checks whether the requested user is valid. \n[Command Reference](validateUser)""") -@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) associated with the support account.""") +@validation_response_group.command(name=cli_util.override('support.validate_user.command_name', 'validate-user'), help=u"""Checks whether the requested user is valid. For more information, see [Validating a User]. \n[Command Reference](validateUser)""") +@cli_util.option('--csi', help=u"""The Customer Support Identifier (CSI) number associated with the support account. The CSI is required for technical support tickets and optional for limits and billing tickets.""") @cli_util.option('--problem-type', type=custom_types.CliCaseInsensitiveChoice(["LIMIT", "LEGACY_LIMIT", "TECH", "ACCOUNT", "TAXONOMY"]), help=u"""The kind of support request.""") -@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account.""") +@cli_util.option('--ocid', help=u"""User OCID for Oracle Identity Cloud Service (IDCS) users who also have a federated Oracle Cloud Infrastructure account. User OCID is mandatory for OCI Users and optional for Multicloud users.""") @cli_util.option('--homeregion', help=u"""The region of the tenancy.""") @cli_util.option('--bearertokentype', help=u"""Token type that determine which cloud provider the request come from.""") @cli_util.option('--bearertoken', help=u"""Token that provided by multi cloud provider, which help to validate the email.""") @cli_util.option('--idtoken', help=u"""IdToken that provided by multi cloud provider, which help to validate the email.""") -@cli_util.option('--domainid', help=u"""The OCID of identity domain.""") +@cli_util.option('--domainid', help=u"""The OCID of identity domain. DomainID is mandatory if the user is part of Non Default Identity domain.""") @json_skeleton_utils.get_cli_json_input_option({}) @cli_util.help_option @click.pass_context diff --git a/services/cims/tests/util/generated/command_to_api.py b/services/cims/tests/util/generated/command_to_api.py index 879a8bdf7..7109281ed 100644 --- a/services/cims/tests/util/generated/command_to_api.py +++ b/services/cims/tests/util/generated/command_to_api.py @@ -3,9 +3,7 @@ SDK_client_map = { "support.create_incident": "oci.cims.IncidentClient.create_incident", - "support.get_csi_number": "oci.cims.IncidentClient.get_csi_number", "support.get_incident": "oci.cims.IncidentClient.get_incident", - "support.get_status": "oci.cims.IncidentClient.get_status", "support.list_incident_resource_types": "oci.cims.IncidentClient.list_incident_resource_types", "support.list_incidents": "oci.cims.IncidentClient.list_incidents", "support.update_incident": "oci.cims.IncidentClient.update_incident", diff --git a/services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py b/services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py index c384abaa1..26c6ab5da 100644 --- a/services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py +++ b/services/data_flow/src/oci_cli_data_flow/generated/dataflow_cli.py @@ -1804,7 +1804,7 @@ def list_runs(ctx, from_json, all_pages, page_size, compartment_id, application_ @sql_endpoint_collection_group.command(name=cli_util.override('data_flow.list_sql_endpoints.command_name', 'list-sql-endpoints'), help=u"""Lists all Sql Endpoints in the specified compartment. The query must include compartmentId or sqlEndpointId. If the query does not include either compartmentId or sqlEndpointId, an error is returned. \n[Command Reference](listSqlEndpoints)""") @cli_util.option('--compartment-id', help=u"""The OCID of the compartment in which to query resources.""") @cli_util.option('--sql-endpoint-id', help=u"""The unique id of the SQL Endpoint.""") -@cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION"]), help=u"""A filter to return only those resources whose sqlEndpointLifecycleState matches the given sqlEndpointLifecycleState.""") +@cli_util.option('--lifecycle-state', type=custom_types.CliCaseInsensitiveChoice(["CREATING", "ACTIVE", "DELETING", "DELETED", "FAILED", "UPDATING", "NEEDS_ATTENTION", "INACTIVE"]), help=u"""A filter to return only those resources whose sqlEndpointLifecycleState matches the given sqlEndpointLifecycleState.""") @cli_util.option('--display-name', help=u"""The query parameter for the Spark application name.""") @cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items that can be returned.""") @cli_util.option('--page', help=u"""The page token representing the page at which to start retrieving results. This is usually retrieved from a previous list call.""") @@ -2128,6 +2128,61 @@ def start_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_s cli_util.render_response(result, ctx) +@sql_endpoint_group.command(name=cli_util.override('data_flow.start_sql_endpoint.command_name', 'start'), help=u"""Starts the SqlEndpoint for a given `SqlEndpointId`. When provided, If-Match is checked against ETag values of the resource. \n[Command Reference](startSqlEndpoint)""") +@cli_util.option('--sql-endpoint-id', required=True, help=u"""The unique id of the SQL Endpoint.""") +@cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""") +@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "CANCELLED", "CANCELLING", "FAILED", "INPROGRESS", "SUCCEEDED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""") +@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""") +@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""") +@json_skeleton_utils.get_cli_json_input_option({}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) +@cli_util.wrap_exceptions +def start_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_endpoint_id, if_match): + + if isinstance(sql_endpoint_id, six.string_types) and len(sql_endpoint_id.strip()) == 0: + raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') + + kwargs = {} + if if_match is not None: + kwargs['if_match'] = if_match + kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id']) + client = cli_util.build_client('data_flow', 'data_flow', ctx) + result = client.start_sql_endpoint( + sql_endpoint_id=sql_endpoint_id, + **kwargs + ) + if wait_for_state: + + if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')): + try: + wait_period_kwargs = {} + if max_wait_seconds is not None: + wait_period_kwargs['max_wait_seconds'] = max_wait_seconds + if wait_interval_seconds is not None: + wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds + if 'opc-work-request-id' not in result.headers: + click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state') + cli_util.render_response(result, ctx) + return + + click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr) + result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', wait_for_state, **wait_period_kwargs) + except oci.exceptions.MaximumWaitTimeExceeded as e: + # If we fail, we should show an error, but we should still provide the information to the customer + click.echo('Failed to wait until the work request entered the specified state. Outputting last known resource state', file=sys.stderr) + cli_util.render_response(result, ctx) + sys.exit(2) + except Exception: + click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state', file=sys.stderr) + cli_util.render_response(result, ctx) + raise + else: + click.echo('Unable to wait for the work request to enter the specified state', file=sys.stderr) + cli_util.render_response(result, ctx) + + @pool_group.command(name=cli_util.override('data_flow.stop_pool.command_name', 'stop'), help=u"""Stops the dataflow pool for a given `poolId`. When provided, If-Match is checked against ETag values of the resource. \n[Command Reference](stopPool)""") @cli_util.option('--pool-id', required=True, help=u"""The unique ID for a pool.""") @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""") @@ -2183,6 +2238,61 @@ def stop_pool(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_se cli_util.render_response(result, ctx) +@sql_endpoint_group.command(name=cli_util.override('data_flow.stop_sql_endpoint.command_name', 'stop'), help=u"""Stops the SqlEndpoint for a given `SqlEndpointId`. When provided, If-Match is checked against ETag values of the resource. \n[Command Reference](stopSqlEndpoint)""") +@cli_util.option('--sql-endpoint-id', required=True, help=u"""The unique id of the SQL Endpoint.""") +@cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""") +@cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "CANCELLED", "CANCELLING", "FAILED", "INPROGRESS", "SUCCEEDED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""") +@cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""") +@cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""") +@json_skeleton_utils.get_cli_json_input_option({}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}) +@cli_util.wrap_exceptions +def stop_sql_endpoint(ctx, from_json, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_endpoint_id, if_match): + + if isinstance(sql_endpoint_id, six.string_types) and len(sql_endpoint_id.strip()) == 0: + raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') + + kwargs = {} + if if_match is not None: + kwargs['if_match'] = if_match + kwargs['opc_request_id'] = cli_util.use_or_generate_request_id(ctx.obj['request_id']) + client = cli_util.build_client('data_flow', 'data_flow', ctx) + result = client.stop_sql_endpoint( + sql_endpoint_id=sql_endpoint_id, + **kwargs + ) + if wait_for_state: + + if hasattr(client, 'get_work_request') and callable(getattr(client, 'get_work_request')): + try: + wait_period_kwargs = {} + if max_wait_seconds is not None: + wait_period_kwargs['max_wait_seconds'] = max_wait_seconds + if wait_interval_seconds is not None: + wait_period_kwargs['max_interval_seconds'] = wait_interval_seconds + if 'opc-work-request-id' not in result.headers: + click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state') + cli_util.render_response(result, ctx) + return + + click.echo('Action completed. Waiting until the work request has entered state: {}'.format(wait_for_state), file=sys.stderr) + result = oci.wait_until(client, client.get_work_request(result.headers['opc-work-request-id']), 'status', wait_for_state, **wait_period_kwargs) + except oci.exceptions.MaximumWaitTimeExceeded as e: + # If we fail, we should show an error, but we should still provide the information to the customer + click.echo('Failed to wait until the work request entered the specified state. Outputting last known resource state', file=sys.stderr) + cli_util.render_response(result, ctx) + sys.exit(2) + except Exception: + click.echo('Encountered error while waiting for work request to enter the specified state. Outputting last known resource state', file=sys.stderr) + cli_util.render_response(result, ctx) + raise + else: + click.echo('Unable to wait for the work request to enter the specified state', file=sys.stderr) + cli_util.render_response(result, ctx) + + @application_group.command(name=cli_util.override('data_flow.update_application.command_name', 'update'), help=u"""Updates an application using an `applicationId`. \n[Command Reference](updateApplication)""") @cli_util.option('--application-id', required=True, help=u"""The unique ID for an application.""") @cli_util.option('--class-name', help=u"""The class for the application.""") @@ -2623,23 +2733,34 @@ def update_run(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_int @cli_util.option('--sql-endpoint-id', required=True, help=u"""The unique id of the SQL Endpoint.""") @cli_util.option('--defined-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Defined tags for this resource. Each key is predefined and scoped to a namespace. For more information, see [Resource Tags]. Example: `{\"Operations\": {\"CostCenter\": \"42\"}}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--freeform-tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""Free-form tags for this resource. Each tag is a simple key-value pair with no predefined name, type, or namespace. For more information, see [Resource Tags]. Example: `{\"Department\": \"Finance\"}`""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--display-name', help=u"""The SQL Endpoint name, which can be changed.""") +@cli_util.option('--description', help=u"""The description of CreateSQLEndpointDetails.""") +@cli_util.option('--driver-shape', help=u"""The shape of the SQL Endpoint driver instance.""") +@cli_util.option('--driver-shape-config', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--executor-shape', help=u"""The shape of the SQL Endpoint worker instance.""") +@cli_util.option('--executor-shape-config', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--min-executor-count', type=click.INT, help=u"""The minimum number of executors.""") +@cli_util.option('--max-executor-count', type=click.INT, help=u"""The maximum number of executors.""") +@cli_util.option('--metastore-id', help=u"""Metastore OCID""") +@cli_util.option('--lake-id', help=u"""OCI lake OCID""") +@cli_util.option('--spark-advanced-configurations', type=custom_types.CLI_COMPLEX_TYPE, help=u"""The Spark configuration passed to the running process. See https://spark.apache.org/docs/latest/configuration.html#available-properties. Example: { \"spark.app.name\" : \"My App Name\", \"spark.shuffle.io.maxRetries\" : \"4\" } Note: Not all Spark properties are permitted to be set. Attempting to set a property that is not allowed to be overwritten will cause a 400 status to be returned.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--if-match', help=u"""For optimistic concurrency control. In the PUT or DELETE call for a resource, set the `if-match` parameter to the value of the etag from a previous GET or POST response for that resource. The resource will be updated or deleted only if the etag you provide matches the resource's current etag value.""") @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True) @cli_util.option('--wait-for-state', type=custom_types.CliCaseInsensitiveChoice(["ACCEPTED", "CANCELLED", "CANCELLING", "FAILED", "INPROGRESS", "SUCCEEDED"]), multiple=True, help="""This operation asynchronously creates, modifies or deletes a resource and uses a work request to track the progress of the operation. Specify this option to perform the action and then wait until the work request reaches a certain state. Multiple states can be specified, returning on the first state. For example, --wait-for-state SUCCEEDED --wait-for-state FAILED would return on whichever lifecycle state is reached first. If timeout is reached, a return code of 2 is returned. For any other error, a return code of 1 is returned.""") @cli_util.option('--max-wait-seconds', type=click.INT, help="""The maximum time to wait for the work request to reach the state defined by --wait-for-state. Defaults to 1200 seconds.""") @cli_util.option('--wait-interval-seconds', type=click.INT, help="""Check every --wait-interval-seconds to see whether the work request has reached the state defined by --wait-for-state. Defaults to 30 seconds.""") -@json_skeleton_utils.get_cli_json_input_option({'defined-tags': {'module': 'data_flow', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'data_flow', 'class': 'dict(str, string)'}}) +@json_skeleton_utils.get_cli_json_input_option({'defined-tags': {'module': 'data_flow', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'data_flow', 'class': 'dict(str, string)'}, 'driver-shape-config': {'module': 'data_flow', 'class': 'ShapeConfig'}, 'executor-shape-config': {'module': 'data_flow', 'class': 'ShapeConfig'}, 'spark-advanced-configurations': {'module': 'data_flow', 'class': 'dict(str, string)'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'defined-tags': {'module': 'data_flow', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'data_flow', 'class': 'dict(str, string)'}}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'defined-tags': {'module': 'data_flow', 'class': 'dict(str, dict(str, object))'}, 'freeform-tags': {'module': 'data_flow', 'class': 'dict(str, string)'}, 'driver-shape-config': {'module': 'data_flow', 'class': 'ShapeConfig'}, 'executor-shape-config': {'module': 'data_flow', 'class': 'ShapeConfig'}, 'spark-advanced-configurations': {'module': 'data_flow', 'class': 'dict(str, string)'}}) @cli_util.wrap_exceptions -def update_sql_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_endpoint_id, defined_tags, freeform_tags, if_match): +def update_sql_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, wait_interval_seconds, sql_endpoint_id, defined_tags, freeform_tags, display_name, description, driver_shape, driver_shape_config, executor_shape, executor_shape_config, min_executor_count, max_executor_count, metastore_id, lake_id, spark_advanced_configurations, if_match): if isinstance(sql_endpoint_id, six.string_types) and len(sql_endpoint_id.strip()) == 0: raise click.UsageError('Parameter --sql-endpoint-id cannot be whitespace or empty string') if not force: - if defined_tags or freeform_tags: - if not click.confirm("WARNING: Updates to defined-tags and freeform-tags will replace any existing values. Are you sure you want to continue?"): + if defined_tags or freeform_tags or driver_shape_config or executor_shape_config or spark_advanced_configurations: + if not click.confirm("WARNING: Updates to defined-tags and freeform-tags and driver-shape-config and executor-shape-config and spark-advanced-configurations will replace any existing values. Are you sure you want to continue?"): ctx.abort() kwargs = {} @@ -2655,6 +2776,39 @@ def update_sql_endpoint(ctx, from_json, force, wait_for_state, max_wait_seconds, if freeform_tags is not None: _details['freeformTags'] = cli_util.parse_json_parameter("freeform_tags", freeform_tags) + if display_name is not None: + _details['displayName'] = display_name + + if description is not None: + _details['description'] = description + + if driver_shape is not None: + _details['driverShape'] = driver_shape + + if driver_shape_config is not None: + _details['driverShapeConfig'] = cli_util.parse_json_parameter("driver_shape_config", driver_shape_config) + + if executor_shape is not None: + _details['executorShape'] = executor_shape + + if executor_shape_config is not None: + _details['executorShapeConfig'] = cli_util.parse_json_parameter("executor_shape_config", executor_shape_config) + + if min_executor_count is not None: + _details['minExecutorCount'] = min_executor_count + + if max_executor_count is not None: + _details['maxExecutorCount'] = max_executor_count + + if metastore_id is not None: + _details['metastoreId'] = metastore_id + + if lake_id is not None: + _details['lakeId'] = lake_id + + if spark_advanced_configurations is not None: + _details['sparkAdvancedConfigurations'] = cli_util.parse_json_parameter("spark_advanced_configurations", spark_advanced_configurations) + client = cli_util.build_client('data_flow', 'data_flow', ctx) result = client.update_sql_endpoint( sql_endpoint_id=sql_endpoint_id, diff --git a/services/data_flow/tests/util/generated/command_to_api.py b/services/data_flow/tests/util/generated/command_to_api.py index 076efdcbb..8dcb8c119 100644 --- a/services/data_flow/tests/util/generated/command_to_api.py +++ b/services/data_flow/tests/util/generated/command_to_api.py @@ -38,7 +38,9 @@ "data_flow.list_work_request_logs": "oci.data_flow.DataFlowClient.list_work_request_logs", "data_flow.list_work_requests": "oci.data_flow.DataFlowClient.list_work_requests", "data_flow.start_pool": "oci.data_flow.DataFlowClient.start_pool", + "data_flow.start_sql_endpoint": "oci.data_flow.DataFlowClient.start_sql_endpoint", "data_flow.stop_pool": "oci.data_flow.DataFlowClient.stop_pool", + "data_flow.stop_sql_endpoint": "oci.data_flow.DataFlowClient.stop_sql_endpoint", "data_flow.update_application": "oci.data_flow.DataFlowClient.update_application", "data_flow.update_pool": "oci.data_flow.DataFlowClient.update_pool", "data_flow.update_private_endpoint": "oci.data_flow.DataFlowClient.update_private_endpoint", diff --git a/services/identity_domains/src/oci_cli_identity_domains/generated/identitydomains_cli.py b/services/identity_domains/src/oci_cli_identity_domains/generated/identitydomains_cli.py index 20f94116d..7b8ef7ae0 100644 --- a/services/identity_domains/src/oci_cli_identity_domains/generated/identitydomains_cli.py +++ b/services/identity_domains/src/oci_cli_identity_domains/generated/identitydomains_cli.py @@ -144,12 +144,6 @@ def network_perimeter_group(): pass -@click.command(cli_util.override('identity_domains.conditions_group.command_name', 'conditions'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") -@cli_util.help_option_group -def conditions_group(): - pass - - @click.command(cli_util.override('identity_domains.my_customer_secret_key_group.command_name', 'my-customer-secret-key'), cls=CommandGroupWithAlias, help="""The user's customer secret key.""") @cli_util.help_option_group def my_customer_secret_key_group(): @@ -336,12 +330,6 @@ def o_auth2_client_credential_group(): pass -@click.command(cli_util.override('identity_domains.rules_group.command_name', 'rules'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") -@cli_util.help_option_group -def rules_group(): - pass - - @click.command(cli_util.override('identity_domains.my_o_auth2_client_credentials_group.command_name', 'my-o-auth2-client-credentials'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") @cli_util.help_option_group def my_o_auth2_client_credentials_group(): @@ -426,6 +414,12 @@ def cloud_gate_group(): pass +@click.command(cli_util.override('identity_domains.restore_oci_console_policy_group.command_name', 'restore-oci-console-policy'), cls=CommandGroupWithAlias, help="""Schema to restoring OCI Console Policy to Factory Defaults.""") +@cli_util.help_option_group +def restore_oci_console_policy_group(): + pass + + @click.command(cli_util.override('identity_domains.cloud_gate_mappings_group.command_name', 'cloud-gate-mappings'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") @cli_util.help_option_group def cloud_gate_mappings_group(): @@ -504,12 +498,6 @@ def notification_settings_group(): pass -@click.command(cli_util.override('identity_domains.policies_group.command_name', 'policies'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") -@cli_util.help_option_group -def policies_group(): - pass - - @click.command(cli_util.override('identity_domains.rule_group.command_name', 'rule'), cls=CommandGroupWithAlias, help="""Rule resource. A unit that has a condition which on evaluation with input returns defined values.""") @cli_util.help_option_group def rule_group(): @@ -684,6 +672,12 @@ def api_key_group(): pass +@click.command(cli_util.override('identity_domains.oci_console_sign_on_policy_consent_group.command_name', 'oci-console-sign-on-policy-consent'), cls=CommandGroupWithAlias, help="""The \"Security Policy for OCI Console\" sign-on policy consent resource used to record consents. The schema to record the \"Security Policy for OCI Console\" sign-on policy consent.""") +@cli_util.help_option_group +def oci_console_sign_on_policy_consent_group(): + pass + + @click.command(cli_util.override('identity_domains.my_groups_group.command_name', 'my-groups'), cls=CommandGroupWithAlias, help="""The SCIM protocol defines a standard set of query parameters that can be used to filter, sort, and paginate to return zero or more resources in a query response. Queries MAY be made against a single resource or a resource type endpoint (e.g., /Users), or the service provider Base URI.""") @cli_util.help_option_group def my_groups_group(): @@ -764,7 +758,6 @@ def identity_setting_group(): identity_domains_root_group.add_command(self_registration_profiles_group) identity_domains_root_group.add_command(my_completed_approvals_group) identity_domains_root_group.add_command(network_perimeter_group) -identity_domains_root_group.add_command(conditions_group) identity_domains_root_group.add_command(my_customer_secret_key_group) identity_domains_root_group.add_command(schema_group) identity_domains_root_group.add_command(password_policies_group) @@ -796,7 +789,6 @@ def identity_setting_group(): identity_domains_root_group.add_command(security_question_group) identity_domains_root_group.add_command(authentication_factor_settings_group) identity_domains_root_group.add_command(o_auth2_client_credential_group) -identity_domains_root_group.add_command(rules_group) identity_domains_root_group.add_command(my_o_auth2_client_credentials_group) identity_domains_root_group.add_command(my_smtp_credential_group) identity_domains_root_group.add_command(dynamic_resource_group_group) @@ -811,6 +803,7 @@ def identity_setting_group(): identity_domains_root_group.add_command(settings_group) identity_domains_root_group.add_command(o_auth_client_certificates_group) identity_domains_root_group.add_command(cloud_gate_group) +identity_domains_root_group.add_command(restore_oci_console_policy_group) identity_domains_root_group.add_command(cloud_gate_mappings_group) identity_domains_root_group.add_command(users_group) identity_domains_root_group.add_command(my_pending_approvals_group) @@ -824,7 +817,6 @@ def identity_setting_group(): identity_domains_root_group.add_command(self_registration_profile_group) identity_domains_root_group.add_command(my_authentication_factor_initiator_group) identity_domains_root_group.add_command(notification_settings_group) -identity_domains_root_group.add_command(policies_group) identity_domains_root_group.add_command(rule_group) identity_domains_root_group.add_command(user_status_changer_group) identity_domains_root_group.add_command(my_apps_group) @@ -854,6 +846,7 @@ def identity_setting_group(): identity_domains_root_group.add_command(my_support_account_group) identity_domains_root_group.add_command(identity_provider_group) identity_domains_root_group.add_command(api_key_group) +identity_domains_root_group.add_command(oci_console_sign_on_policy_consent_group) identity_domains_root_group.add_command(my_groups_group) identity_domains_root_group.add_command(account_recovery_settings_group) identity_domains_root_group.add_command(auth_token_group) @@ -3076,7 +3069,7 @@ def create_cloud_gate_server(ctx, from_json, schemas, display_name, host_name, p cli_util.render_response(result, ctx) -@condition_group.command(name=cli_util.override('identity_domains.create_condition.command_name', 'create'), help=u"""Create a Condition +@condition_group.command(name=cli_util.override('identity_domains.create_condition.command_name', 'create'), help=u"""Create a condition The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](createCondition)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \\\"enterprise\\\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. @@ -3110,7 +3103,7 @@ def create_cloud_gate_server(ctx, from_json, schemas, display_name, host_name, p **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -3139,12 +3132,13 @@ def create_cloud_gate_server(ctx, from_json, schemas, display_name, host_name, p **Added In:** 18.1.6 **SCIM++ Properties:** - caseExact: true - idcsSearchable: false - multiValued: false - mutability: readWrite - required: false - returned: default - type: string - uniqueness: none""") -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}) +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'ConditionExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}, output_type={'module': 'identity_domains', 'class': 'Condition'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'ConditionExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Condition'}) @cli_util.wrap_exceptions -def create_condition(ctx, from_json, schemas, name, attribute_name, operator, attribute_value, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, evaluate_condition_if): +def create_condition(ctx, from_json, schemas, name, attribute_name, operator, attribute_value, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, evaluate_condition_if, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy): kwargs = {} if authorization is not None: @@ -3208,6 +3202,9 @@ def create_condition(ctx, from_json, schemas, name, attribute_name, operator, at if evaluate_condition_if is not None: _details['evaluateConditionIf'] = evaluate_condition_if + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.create_condition( condition=_details, @@ -7348,7 +7345,7 @@ def create_password_policy(ctx, from_json, schemas, name, authorization, resourc cli_util.render_response(result, ctx) -@policy_group.command(name=cli_util.override('identity_domains.create_policy.command_name', 'create'), help=u"""Create a Policy +@policy_group.command(name=cli_util.override('identity_domains.create_policy.command_name', 'create'), help=u"""Create a Policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](createPolicy)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \\\"enterprise\\\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. @@ -7376,7 +7373,7 @@ def create_password_policy(ctx, from_json, schemas, name, authorization, resourc **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -7411,12 +7408,13 @@ def create_password_policy(ctx, from_json, schemas, name, authorization, resourc **SCIM++ Properties:** - idcsCompositeKey: [value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type PolicyRules. For documentation on PolicyRules please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/PolicyRules.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}}) +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'PolicyExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}}, output_type={'module': 'identity_domains', 'class': 'Policy'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'PolicyExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Policy'}) @cli_util.wrap_exceptions -def create_policy(ctx, from_json, schemas, name, policy_type, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, policy_groovy, rules): +def create_policy(ctx, from_json, schemas, name, policy_type, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, policy_groovy, rules, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy): kwargs = {} if authorization is not None: @@ -7484,6 +7482,9 @@ def create_policy(ctx, from_json, schemas, name, policy_type, authorization, res if rules is not None: _details['rules'] = cli_util.parse_json_parameter("rules", rules) + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.create_policy( policy=_details, @@ -7492,7 +7493,91 @@ def create_policy(ctx, from_json, schemas, name, policy_type, authorization, res cli_util.render_response(result, ctx) -@rule_group.command(name=cli_util.override('identity_domains.create_rule.command_name', 'create'), help=u"""Create a Rule +@restore_oci_console_policy_group.command(name=cli_util.override('identity_domains.create_restore_oci_console_policy.command_name', 'create'), help=u"""Create a RestoreOciConsolePolicy entry to restore Policy to factory default. + +The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](createRestoreOciConsolePolicy)""") +@cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: false - multiValued: true - mutability: readWrite - required: true - returned: default - type: string - uniqueness: none REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \\\"enterprise\\\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--consent', required=True, type=click.BOOL, help=u"""**SCIM++ Properties:** - idcsSearchable: false - multiValued: false - required: true - mutability: writeOnly - returned: default - type: boolean Consent to be provided for restoring the Oci Console SignOn Policy to Factory Defaults. Defaults to false""") +@cli_util.option('--reason', required=True, help=u"""**SCIM++ Properties:** - idcsSearchable: false - multiValued: false - mutability: writeOnly - required: true - returned: default - type: string Detailed reason when domain admin opts to restore the Oci Console SignOn Policy to Factory Defaults""") +@cli_util.option('--authorization', help=u"""The Authorization field value consists of credentials containing the authentication information of the user agent for the realm of the resource being requested.""") +@cli_util.option('--resource-type-schema-version', help=u"""An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.""") +@cli_util.option('--id', help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: true - multiValued: false - mutability: readOnly - required: false - returned: always - type: string - uniqueness: global Unique identifier for the SCIM Resource as defined by the Service Provider. Each representation of the Resource MUST include a non-empty id value. This identifier MUST be unique across the Service Provider's entire set of Resources. It MUST be a stable, non-reassignable identifier that does not change when the same Resource is returned in subsequent requests. The value of the id attribute is always issued by the Service Provider and MUST never be specified by the Service Consumer. bulkId: is a reserved keyword and MUST NOT be used in the unique identifier.""") +@cli_util.option('--ocid', help=u"""**SCIM++ Properties:** - caseExact: true - idcsSearchable: true - multiValued: false - mutability: immutable - required: false - returned: default - type: string - uniqueness: global Unique OCI identifier for the SCIM Resource.""") +@cli_util.option('--meta', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--idcs-created-by', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--idcs-last-modified-by', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--idcs-prevented-operations', type=custom_types.CliCaseInsensitiveChoice(["replace", "update", "delete"]), help=u"""**SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none Each value of this attribute specifies an operation that only an internal client may perform on this particular resource.""") +@cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none A list of tags on this resource. + +This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: true - multiValued: false - mutability: readOnly - required: false - returned: default - type: boolean - uniqueness: none A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long.""") +@cli_util.option('--idcs-last-upgraded-in-release', help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: false - multiValued: false - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none The release number when the resource was upgraded.""") +@cli_util.option('--domain-ocid', help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: false - multiValued: false - mutability: readOnly - required: false - returned: default - type: string - uniqueness: none OCI Domain Id (ocid) in which the resource lives.""") +@cli_util.option('--compartment-ocid', help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: false - multiValued: false - mutability: readOnly - required: false - returned: default - type: string - uniqueness: none OCI Compartment Id (ocid) in which the resource lives.""") +@cli_util.option('--tenancy-ocid', help=u"""**SCIM++ Properties:** - caseExact: false - idcsSearchable: false - multiValued: false - mutability: readOnly - required: false - returned: default - type: string - uniqueness: none OCI Tenant Id (ocid) in which the resource lives.""") +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}, output_type={'module': 'identity_domains', 'class': 'RestoreOciConsolePolicy'}) +@cli_util.wrap_exceptions +def create_restore_oci_console_policy(ctx, from_json, schemas, consent, reason, authorization, resource_type_schema_version, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid): + + kwargs = {} + if authorization is not None: + kwargs['authorization'] = authorization + if resource_type_schema_version is not None: + kwargs['resource_type_schema_version'] = resource_type_schema_version + + _details = {} + _details['schemas'] = cli_util.parse_json_parameter("schemas", schemas) + _details['consent'] = consent + _details['reason'] = reason + + if id is not None: + _details['id'] = id + + if ocid is not None: + _details['ocid'] = ocid + + if meta is not None: + _details['meta'] = cli_util.parse_json_parameter("meta", meta) + + if idcs_created_by is not None: + _details['idcsCreatedBy'] = cli_util.parse_json_parameter("idcs_created_by", idcs_created_by) + + if idcs_last_modified_by is not None: + _details['idcsLastModifiedBy'] = cli_util.parse_json_parameter("idcs_last_modified_by", idcs_last_modified_by) + + if idcs_prevented_operations is not None: + _details['idcsPreventedOperations'] = cli_util.parse_json_parameter("idcs_prevented_operations", idcs_prevented_operations) + + if tags is not None: + _details['tags'] = cli_util.parse_json_parameter("tags", tags) + + if delete_in_progress is not None: + _details['deleteInProgress'] = delete_in_progress + + if idcs_last_upgraded_in_release is not None: + _details['idcsLastUpgradedInRelease'] = idcs_last_upgraded_in_release + + if domain_ocid is not None: + _details['domainOcid'] = domain_ocid + + if compartment_ocid is not None: + _details['compartmentOcid'] = compartment_ocid + + if tenancy_ocid is not None: + _details['tenancyOcid'] = tenancy_ocid + + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) + result = client.create_restore_oci_console_policy( + restore_oci_console_policy=_details, + **kwargs + ) + cli_util.render_response(result, ctx) + + +@rule_group.command(name=cli_util.override('identity_domains.create_rule.command_name', 'create'), help=u"""Create a Rule. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](createRule)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""REQUIRED. The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. This specification defines URIs for User, Group, and a standard \\\"enterprise\\\" extension. All representations of SCIM schema MUST include a non-zero value array with value(s) of the URIs supported by that representation. Duplicate values MUST NOT be included. Value order is not specified and MUST not impact behavior. @@ -7528,7 +7613,7 @@ def create_policy(ctx, from_json, schemas, name, policy_type, authorization, res **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -7562,12 +7647,13 @@ def create_policy(ctx, from_json, schemas, name, policy_type, authorization, res **SCIM++ Properties:** - caseExact: true - idcsSearchable: false - multiValued: false - mutability: readWrite - required: false - returned: default - type: string - uniqueness: none""") @cli_util.option('--condition-group', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}}) +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'RuleExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}}, output_type={'module': 'identity_domains', 'class': 'Rule'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'RuleExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Rule'}) @cli_util.wrap_exceptions -def create_rule(ctx, from_json, schemas, name, condition, policy_type, _return, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, locked, rule_groovy, condition_group): +def create_rule(ctx, from_json, schemas, name, condition, policy_type, _return, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, locked, rule_groovy, condition_group, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy): kwargs = {} if authorization is not None: @@ -7640,6 +7726,9 @@ def create_rule(ctx, from_json, schemas, name, condition, policy_type, _return, if condition_group is not None: _details['conditionGroup'] = cli_util.parse_json_parameter("condition_group", condition_group) + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.create_rule( rule=_details, @@ -9284,7 +9373,7 @@ def delete_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization cli_util.render_response(result, ctx) -@condition_group.command(name=cli_util.override('identity_domains.delete_condition.command_name', 'delete'), help=u"""Delete a Condition +@condition_group.command(name=cli_util.override('identity_domains.delete_condition.command_name', 'delete'), help=u"""Delete a condition. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](deleteCondition)""") @cli_util.option('--condition-id', required=True, help=u"""ID of the resource""") @@ -10040,7 +10129,7 @@ def delete_password_policy(ctx, from_json, password_policy_id, authorization, re cli_util.render_response(result, ctx) -@policy_group.command(name=cli_util.override('identity_domains.delete_policy.command_name', 'delete'), help=u"""Delete a Policy +@policy_group.command(name=cli_util.override('identity_domains.delete_policy.command_name', 'delete'), help=u"""Delete a Policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](deletePolicy)""") @cli_util.option('--policy-id', required=True, help=u"""ID of the resource""") @@ -10076,7 +10165,7 @@ def delete_policy(ctx, from_json, policy_id, authorization, resource_type_schema cli_util.render_response(result, ctx) -@rule_group.command(name=cli_util.override('identity_domains.delete_rule.command_name', 'delete'), help=u"""Delete a Rule +@rule_group.command(name=cli_util.override('identity_domains.delete_rule.command_name', 'delete'), help=u"""Delete a Rule. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](deleteRule)""") @cli_util.option('--rule-id', required=True, help=u"""ID of the resource""") @@ -10818,7 +10907,7 @@ def get_cloud_gate_server(ctx, from_json, cloud_gate_server_id, authorization, r cli_util.render_response(result, ctx) -@condition_group.command(name=cli_util.override('identity_domains.get_condition.command_name', 'get'), help=u"""Get a Condition +@condition_group.command(name=cli_util.override('identity_domains.get_condition.command_name', 'get'), help=u"""Get a condition. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](getCondition)""") @cli_util.option('--condition-id', required=True, help=u"""ID of the resource""") @@ -11692,6 +11781,41 @@ def get_o_auth_partner_certificate(ctx, from_json, o_auth_partner_certificate_id cli_util.render_response(result, ctx) +@oci_console_sign_on_policy_consent_group.command(name=cli_util.override('identity_domains.get_oci_console_sign_on_policy_consent.command_name', 'get'), help=u"""Get a OciConsoleSignOnPolicyConsent Entry. + +The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](getOciConsoleSignOnPolicyConsent)""") +@cli_util.option('--oci-console-sign-on-policy-consent-id', required=True, help=u"""ID of the resource""") +@cli_util.option('--authorization', help=u"""The Authorization field value consists of credentials containing the authentication information of the user agent for the realm of the resource being requested.""") +@cli_util.option('--resource-type-schema-version', help=u"""An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.""") +@cli_util.option('--attributes', help=u"""A comma-delimited string that specifies the names of resource attributes that should be returned in the response. By default, a response that contains resource attributes contains only attributes that are defined in the schema for that resource type as returned=always or returned=default. An attribute that is defined as returned=request is returned in a response only if the request specifies its name in the value of this query parameter. If a request specifies this query parameter, the response contains the attributes that this query parameter specifies, as well as any attribute that is defined as returned=always.""") +@cli_util.option('--attribute-sets', type=custom_types.CliCaseInsensitiveChoice(["all", "always", "never", "request", "default"]), multiple=True, help=u"""A multi-valued list of strings indicating the return type of attribute definition. The specified set of attributes can be fetched by the return type of the attribute. One or more values can be given together to fetch more than one group of attributes. If 'attributes' query parameter is also available, union of the two is fetched. Valid values - all, always, never, request, default. Values are case-insensitive.""") +@json_skeleton_utils.get_cli_json_input_option({}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'identity_domains', 'class': 'OciConsoleSignOnPolicyConsent'}) +@cli_util.wrap_exceptions +def get_oci_console_sign_on_policy_consent(ctx, from_json, oci_console_sign_on_policy_consent_id, authorization, resource_type_schema_version, attributes, attribute_sets): + + if isinstance(oci_console_sign_on_policy_consent_id, six.string_types) and len(oci_console_sign_on_policy_consent_id.strip()) == 0: + raise click.UsageError('Parameter --oci-console-sign-on-policy-consent-id cannot be whitespace or empty string') + + kwargs = {} + if authorization is not None: + kwargs['authorization'] = authorization + if resource_type_schema_version is not None: + kwargs['resource_type_schema_version'] = resource_type_schema_version + if attributes is not None: + kwargs['attributes'] = attributes + if attribute_sets is not None and len(attribute_sets) > 0: + kwargs['attribute_sets'] = attribute_sets + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) + result = client.get_oci_console_sign_on_policy_consent( + oci_console_sign_on_policy_consent_id=oci_console_sign_on_policy_consent_id, + **kwargs + ) + cli_util.render_response(result, ctx) + + @password_policy_group.command(name=cli_util.override('identity_domains.get_password_policy.command_name', 'get'), help=u"""Get a password policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](getPasswordPolicy)""") @@ -11727,7 +11851,7 @@ def get_password_policy(ctx, from_json, password_policy_id, authorization, resou cli_util.render_response(result, ctx) -@policy_group.command(name=cli_util.override('identity_domains.get_policy.command_name', 'get'), help=u"""Get a Policy +@policy_group.command(name=cli_util.override('identity_domains.get_policy.command_name', 'get'), help=u"""Get a Policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](getPolicy)""") @cli_util.option('--policy-id', required=True, help=u"""ID of the resource""") @@ -11762,7 +11886,7 @@ def get_policy(ctx, from_json, policy_id, authorization, resource_type_schema_ve cli_util.render_response(result, ctx) -@rule_group.command(name=cli_util.override('identity_domains.get_rule.command_name', 'get'), help=u"""Get a Rule +@rule_group.command(name=cli_util.override('identity_domains.get_rule.command_name', 'get'), help=u"""Get a Rule. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](getRule)""") @cli_util.option('--rule-id', required=True, help=u"""ID of the resource""") @@ -13098,7 +13222,7 @@ def list_cloud_gates(ctx, from_json, all_pages, page_size, filter, sort_by, sort cli_util.render_response(result, ctx) -@conditions_group.command(name=cli_util.override('identity_domains.list_conditions.command_name', 'list'), help=u"""Search Conditions +@condition_group.command(name=cli_util.override('identity_domains.list_conditions.command_name', 'list'), help=u"""Search conditions. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](listConditions)""") @cli_util.option('--filter', help=u"""OPTIONAL. The filter string that is used to request a subset of resources. The filter string MUST be a valid filter expression. See the Filtering section of the SCIM specification for more information (Section 3.4.2.2). The string should contain at least one condition that each item must match in order to be returned in the search results. Each condition specifies an attribute, an operator, and a value. Conditions within a filter can be connected by logical operators (such as AND and OR). Sets of conditions can be grouped together using parentheses.""") @@ -15063,6 +15187,78 @@ def list_o_auth_partner_certificates(ctx, from_json, all_pages, page_size, filte cli_util.render_response(result, ctx) +@oci_console_sign_on_policy_consent_group.command(name=cli_util.override('identity_domains.list_oci_console_sign_on_policy_consents.command_name', 'list'), help=u"""Search OciConsoleSignOnPolicyConsent entries + +The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](listOciConsoleSignOnPolicyConsents)""") +@cli_util.option('--filter', help=u"""OPTIONAL. The filter string that is used to request a subset of resources. The filter string MUST be a valid filter expression. See the Filtering section of the SCIM specification for more information (Section 3.4.2.2). The string should contain at least one condition that each item must match in order to be returned in the search results. Each condition specifies an attribute, an operator, and a value. Conditions within a filter can be connected by logical operators (such as AND and OR). Sets of conditions can be grouped together using parentheses.""") +@cli_util.option('--sort-by', help=u"""OPTIONAL. A string that indicates the attribute whose value SHALL be used to order the returned responses. The sortBy attribute MUST be in standard attribute notation form. See the Attribute Notation section of the SCIM specification for more information (Section 3.10). Also, see the Sorting section of the SCIM specification for more information (Section 3.4.2.3).""") +@cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASCENDING", "DESCENDING"]), help=u"""A string that indicates the order in which the sortBy parameter is applied. Allowed values are 'ascending' and 'descending'. See ([Sorting Section]). OPTIONAL.""") +@cli_util.option('--start-index', type=click.INT, help=u"""OPTIONAL. An integer that indicates the 1-based index of the first query result. See the Pagination section of the SCIM specification for more information. (Section 3.4.2.4). The number of results pages to return. The first page is 1. Specify 2 to access the second page of results, and so on.""") +@cli_util.option('--count', type=click.INT, help=u"""OPTIONAL. An integer that indicates the desired maximum number of query results per page. 1000 is the largest value that you can use. See the Pagination section of the System for Cross-Domain Identity Management Protocol specification for more information. (Section 3.4.2.4).""") +@cli_util.option('--attributes', help=u"""A comma-delimited string that specifies the names of resource attributes that should be returned in the response. By default, a response that contains resource attributes contains only attributes that are defined in the schema for that resource type as returned=always or returned=default. An attribute that is defined as returned=request is returned in a response only if the request specifies its name in the value of this query parameter. If a request specifies this query parameter, the response contains the attributes that this query parameter specifies, as well as any attribute that is defined as returned=always.""") +@cli_util.option('--attribute-sets', type=custom_types.CliCaseInsensitiveChoice(["all", "always", "never", "request", "default"]), multiple=True, help=u"""A multi-valued list of strings indicating the return type of attribute definition. The specified set of attributes can be fetched by the return type of the attribute. One or more values can be given together to fetch more than one group of attributes. If 'attributes' query parameter is also available, union of the two is fetched. Valid values - all, always, never, request, default. Values are case-insensitive.""") +@cli_util.option('--authorization', help=u"""The Authorization field value consists of credentials containing the authentication information of the user agent for the realm of the resource being requested.""") +@cli_util.option('--resource-type-schema-version', help=u"""An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.""") +@cli_util.option('--page', help=u"""The value of the `opc-next-page` response header from the previous 'List' call.""") +@cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return in a paginated 'List' call.""") +@cli_util.option('--all', 'all_pages', is_flag=True, help="""Fetches all pages of results. If you provide this option, then you cannot provide the --limit option.""") +@cli_util.option('--page-size', type=click.INT, help="""When fetching results, the number of results to fetch per call. Only valid when used with --all or --limit, and ignored otherwise.""") +@json_skeleton_utils.get_cli_json_input_option({}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={}, output_type={'module': 'identity_domains', 'class': 'OciConsoleSignOnPolicyConsents'}) +@cli_util.wrap_exceptions +def list_oci_console_sign_on_policy_consents(ctx, from_json, all_pages, page_size, filter, sort_by, sort_order, start_index, count, attributes, attribute_sets, authorization, resource_type_schema_version, page, limit): + + if all_pages and limit: + raise click.UsageError('If you provide the --all option you cannot provide the --limit option') + + kwargs = {} + if filter is not None: + kwargs['filter'] = filter + if sort_by is not None: + kwargs['sort_by'] = sort_by + if sort_order is not None: + kwargs['sort_order'] = sort_order + if start_index is not None: + kwargs['start_index'] = start_index + if count is not None: + kwargs['count'] = count + if attributes is not None: + kwargs['attributes'] = attributes + if attribute_sets is not None and len(attribute_sets) > 0: + kwargs['attribute_sets'] = attribute_sets + if authorization is not None: + kwargs['authorization'] = authorization + if resource_type_schema_version is not None: + kwargs['resource_type_schema_version'] = resource_type_schema_version + if page is not None: + kwargs['page'] = page + if limit is not None: + kwargs['limit'] = limit + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) + if all_pages: + if page_size: + kwargs['limit'] = page_size + + result = cli_util.list_call_get_all_results( + client.list_oci_console_sign_on_policy_consents, + **kwargs + ) + elif limit is not None: + result = cli_util.list_call_get_up_to_limit( + client.list_oci_console_sign_on_policy_consents, + limit, + page_size, + **kwargs + ) + else: + result = client.list_oci_console_sign_on_policy_consents( + **kwargs + ) + cli_util.render_response(result, ctx) + + @password_policies_group.command(name=cli_util.override('identity_domains.list_password_policies.command_name', 'list'), help=u"""Search for password policies. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](listPasswordPolicies)""") @@ -15135,7 +15331,7 @@ def list_password_policies(ctx, from_json, all_pages, page_size, filter, sort_by cli_util.render_response(result, ctx) -@policies_group.command(name=cli_util.override('identity_domains.list_policies.command_name', 'list'), help=u"""Search Policies +@policy_group.command(name=cli_util.override('identity_domains.list_policies.command_name', 'list'), help=u"""Search Policies. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](listPolicies)""") @cli_util.option('--filter', help=u"""OPTIONAL. The filter string that is used to request a subset of resources. The filter string MUST be a valid filter expression. See the Filtering section of the SCIM specification for more information (Section 3.4.2.2). The string should contain at least one condition that each item must match in order to be returned in the search results. Each condition specifies an attribute, an operator, and a value. Conditions within a filter can be connected by logical operators (such as AND and OR). Sets of conditions can be grouped together using parentheses.""") @@ -15279,7 +15475,7 @@ def list_resource_type_schema_attributes(ctx, from_json, all_pages, page_size, f cli_util.render_response(result, ctx) -@rules_group.command(name=cli_util.override('identity_domains.list_rules.command_name', 'list'), help=u"""Search Rules +@rule_group.command(name=cli_util.override('identity_domains.list_rules.command_name', 'list'), help=u"""Search Rules. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](listRules)""") @cli_util.option('--filter', help=u"""OPTIONAL. The filter string that is used to request a subset of resources. The filter string MUST be a valid filter expression. See the Filtering section of the SCIM specification for more information (Section 3.4.2.2). The string should contain at least one condition that each item must match in order to be returned in the search results. Each condition specifies an attribute, an operator, and a value. Conditions within a filter can be connected by logical operators (such as AND and OR). Sets of conditions can be grouped together using parentheses.""") @@ -16471,7 +16667,7 @@ def patch_cloud_gate_server(ctx, from_json, cloud_gate_server_id, schemas, opera cli_util.render_response(result, ctx) -@condition_group.command(name=cli_util.override('identity_domains.patch_condition.command_name', 'patch'), help=u"""Update a Condition +@condition_group.command(name=cli_util.override('identity_domains.patch_condition.command_name', 'patch'), help=u"""Update a condition. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](patchCondition)""") @cli_util.option('--condition-id', required=True, help=u"""ID of the resource""") @@ -17396,7 +17592,7 @@ def patch_password_policy(ctx, from_json, password_policy_id, schemas, operation cli_util.render_response(result, ctx) -@policy_group.command(name=cli_util.override('identity_domains.patch_policy.command_name', 'patch'), help=u"""Update a Policy +@policy_group.command(name=cli_util.override('identity_domains.patch_policy.command_name', 'patch'), help=u"""Update a Policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](patchPolicy)""") @cli_util.option('--policy-id', required=True, help=u"""ID of the resource""") @@ -17442,7 +17638,7 @@ def patch_policy(ctx, from_json, policy_id, schemas, operations, authorization, cli_util.render_response(result, ctx) -@rule_group.command(name=cli_util.override('identity_domains.patch_rule.command_name', 'patch'), help=u"""Update a Rule +@rule_group.command(name=cli_util.override('identity_domains.patch_rule.command_name', 'patch'), help=u"""Update a Rule. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](patchRule)""") @cli_util.option('--rule-id', required=True, help=u"""ID of the resource""") @@ -19842,7 +20038,7 @@ def put_cloud_gate_server(ctx, from_json, force, cloud_gate_server_id, schemas, cli_util.render_response(result, ctx) -@condition_group.command(name=cli_util.override('identity_domains.put_condition.command_name', 'put'), help=u"""Replace a Condition +@condition_group.command(name=cli_util.override('identity_domains.put_condition.command_name', 'put'), help=u"""Replace a condition. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](putCondition)""") @cli_util.option('--condition-id', required=True, help=u"""ID of the resource""") @@ -19877,7 +20073,7 @@ def put_cloud_gate_server(ctx, from_json, force, cloud_gate_server_id, schemas, **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -19906,20 +20102,21 @@ def put_cloud_gate_server(ctx, from_json, force, cloud_gate_server_id, schemas, **Added In:** 18.1.6 **SCIM++ Properties:** - caseExact: true - idcsSearchable: false - multiValued: false - mutability: readWrite - required: false - returned: default - type: string - uniqueness: none""") +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--if-match', help=u"""Used to make the request conditional on an ETag""") @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True) -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'ConditionExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}}, output_type={'module': 'identity_domains', 'class': 'Condition'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'ConditionExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Condition'}) @cli_util.wrap_exceptions -def put_condition(ctx, from_json, force, condition_id, schemas, name, attribute_name, operator, attribute_value, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, evaluate_condition_if, if_match): +def put_condition(ctx, from_json, force, condition_id, schemas, name, attribute_name, operator, attribute_value, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, evaluate_condition_if, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): if isinstance(condition_id, six.string_types) and len(condition_id.strip()) == 0: raise click.UsageError('Parameter --condition-id cannot be whitespace or empty string') if not force: - if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags: - if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags will replace any existing values. Are you sure you want to continue?"): + if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: + if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags and urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy will replace any existing values. Are you sure you want to continue?"): ctx.abort() kwargs = {} @@ -19986,6 +20183,9 @@ def put_condition(ctx, from_json, force, condition_id, schemas, name, attribute_ if evaluate_condition_if is not None: _details['evaluateConditionIf'] = evaluate_condition_if + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.put_condition( condition_id=condition_id, @@ -22426,7 +22626,7 @@ def put_password_policy(ctx, from_json, force, password_policy_id, schemas, name cli_util.render_response(result, ctx) -@policy_group.command(name=cli_util.override('identity_domains.put_policy.command_name', 'put'), help=u"""Replace a Policy +@policy_group.command(name=cli_util.override('identity_domains.put_policy.command_name', 'put'), help=u"""Replace a Policy. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](putPolicy)""") @cli_util.option('--policy-id', required=True, help=u"""ID of the resource""") @@ -22455,7 +22655,7 @@ def put_password_policy(ctx, from_json, force, password_policy_id, schemas, name **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -22490,20 +22690,21 @@ def put_password_policy(ctx, from_json, force, password_policy_id, schemas, name **SCIM++ Properties:** - idcsCompositeKey: [value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type PolicyRules. For documentation on PolicyRules please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/PolicyRules.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--if-match', help=u"""Used to make the request conditional on an ETag""") @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True) -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}}) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'PolicyExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}}, output_type={'module': 'identity_domains', 'class': 'Policy'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'rules': {'module': 'identity_domains', 'class': 'list[PolicyRules]'}, 'policy-type': {'module': 'identity_domains', 'class': 'PolicyPolicyType'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'PolicyExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Policy'}) @cli_util.wrap_exceptions -def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, policy_groovy, rules, if_match): +def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, policy_groovy, rules, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): if isinstance(policy_id, six.string_types) and len(policy_id.strip()) == 0: raise click.UsageError('Parameter --policy-id cannot be whitespace or empty string') if not force: - if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags or rules or policy_type: - if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags and rules and policy-type will replace any existing values. Are you sure you want to continue?"): + if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags or rules or policy_type or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: + if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags and rules and policy-type and urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy will replace any existing values. Are you sure you want to continue?"): ctx.abort() kwargs = {} @@ -22574,6 +22775,9 @@ def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, aut if rules is not None: _details['rules'] = cli_util.parse_json_parameter("rules", rules) + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.put_policy( policy_id=policy_id, @@ -22583,7 +22787,7 @@ def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, aut cli_util.render_response(result, ctx) -@rule_group.command(name=cli_util.override('identity_domains.put_rule.command_name', 'put'), help=u"""Replace a Rule +@rule_group.command(name=cli_util.override('identity_domains.put_rule.command_name', 'put'), help=u"""Replace a Rule. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](putRule)""") @cli_util.option('--rule-id', required=True, help=u"""ID of the resource""") @@ -22620,7 +22824,7 @@ def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, aut **SCIM++ Properties:** - idcsSearchable: false - multiValued: true - mutability: readOnly - required: false - returned: request - type: string - uniqueness: none""") @cli_util.option('--tags', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A list of tags on this resource. -**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none +**SCIM++ Properties:** - idcsCompositeKey: [key, value] - idcsCsvAttributeNameMappings: [[columnHeaderName:Tag Key, mapsTo:tags.key], [columnHeaderName:Tag Value, mapsTo:tags.value]] - idcsSearchable: true - multiValued: true - mutability: readWrite - required: false - returned: request - type: complex - uniqueness: none This option is a JSON list with items of type Tags. For documentation on tags please see our API reference: https://docs.cloud.oracle.com/api/#/en/identitydomains/v1/datatypes/Tags.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--delete-in-progress', type=click.BOOL, help=u"""A boolean flag indicating this resource in the process of being deleted. Usually set to true when synchronous deletion of the resource would take too long. @@ -22654,20 +22858,21 @@ def put_policy(ctx, from_json, force, policy_id, schemas, name, policy_type, aut **SCIM++ Properties:** - caseExact: true - idcsSearchable: false - multiValued: false - mutability: readWrite - required: false - returned: default - type: string - uniqueness: none""") @cli_util.option('--condition-group', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy', type=custom_types.CLI_COMPLEX_TYPE, help=u"""""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @cli_util.option('--if-match', help=u"""Used to make the request conditional on an ETag""") @cli_util.option('--force', help="""Perform update without prompting for confirmation.""", is_flag=True) -@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}}) +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'RuleExtensionOciconsolesignonpolicyconsentPolicy'}}) @cli_util.help_option @click.pass_context -@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}}, output_type={'module': 'identity_domains', 'class': 'Rule'}) +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'meta': {'module': 'identity_domains', 'class': 'Meta'}, 'idcs-created-by': {'module': 'identity_domains', 'class': 'IdcsCreatedBy'}, 'idcs-last-modified-by': {'module': 'identity_domains', 'class': 'IdcsLastModifiedBy'}, 'tags': {'module': 'identity_domains', 'class': 'list[Tags]'}, 'condition-group': {'module': 'identity_domains', 'class': 'RuleConditionGroup'}, 'policy-type': {'module': 'identity_domains', 'class': 'RulePolicyType'}, '-return': {'module': 'identity_domains', 'class': 'list[RuleReturn]'}, 'urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy': {'module': 'identity_domains', 'class': 'RuleExtensionOciconsolesignonpolicyconsentPolicy'}}, output_type={'module': 'identity_domains', 'class': 'Rule'}) @cli_util.wrap_exceptions -def put_rule(ctx, from_json, force, rule_id, schemas, name, condition, policy_type, _return, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, locked, rule_groovy, condition_group, if_match): +def put_rule(ctx, from_json, force, rule_id, schemas, name, condition, policy_type, _return, authorization, resource_type_schema_version, attributes, attribute_sets, id, ocid, meta, idcs_created_by, idcs_last_modified_by, idcs_prevented_operations, tags, delete_in_progress, idcs_last_upgraded_in_release, domain_ocid, compartment_ocid, tenancy_ocid, external_id, description, active, locked, rule_groovy, condition_group, urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy, if_match): if isinstance(rule_id, six.string_types) and len(rule_id.strip()) == 0: raise click.UsageError('Parameter --rule-id cannot be whitespace or empty string') if not force: - if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags or condition_group or policy_type or _return: - if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags and condition-group and policy-type and -return will replace any existing values. Are you sure you want to continue?"): + if schemas or meta or idcs_created_by or idcs_last_modified_by or idcs_prevented_operations or tags or condition_group or policy_type or _return or urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy: + if not click.confirm("WARNING: Updates to schemas and meta and idcs-created-by and idcs-last-modified-by and idcs-prevented-operations and tags and condition-group and policy-type and -return and urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent-policy will replace any existing values. Are you sure you want to continue?"): ctx.abort() kwargs = {} @@ -22743,6 +22948,9 @@ def put_rule(ctx, from_json, force, rule_id, schemas, name, condition, policy_ty if condition_group is not None: _details['conditionGroup'] = cli_util.parse_json_parameter("condition_group", condition_group) + if urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy is not None: + _details['urn:ietf:params:scim:schemas:oracle:idcs:extension:ociconsolesignonpolicyconsent:Policy'] = cli_util.parse_json_parameter("urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy", urnietfparamsscimschemasoracleidcsextensionociconsolesignonpolicyconsent_policy) + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) result = client.put_rule( rule_id=rule_id, @@ -25488,7 +25696,7 @@ def search_cloud_gates(ctx, from_json, schemas, authorization, resource_type_sch cli_util.render_response(result, ctx) -@conditions_group.command(name=cli_util.override('identity_domains.search_conditions.command_name', 'search'), help=u"""Search Conditions Using POST +@condition_group.command(name=cli_util.override('identity_domains.search_conditions.command_name', 'search'), help=u"""Search Conditions Using POST. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](searchConditions)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. Query requests MUST be identified using the following URI: \"urn:ietf:params:scim:api:messages:2.0:SearchRequest\" REQUIRED.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @@ -26516,6 +26724,70 @@ def search_o_auth_partner_certificates(ctx, from_json, schemas, authorization, r cli_util.render_response(result, ctx) +@oci_console_sign_on_policy_consent_group.command(name=cli_util.override('identity_domains.search_oci_console_sign_on_policy_consents.command_name', 'search'), help=u"""Search OciConsoleSignOnPolicyConsents Using POST + +The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](searchOciConsoleSignOnPolicyConsents)""") +@cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. Query requests MUST be identified using the following URI: \"urn:ietf:params:scim:api:messages:2.0:SearchRequest\" REQUIRED.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--authorization', help=u"""The Authorization field value consists of credentials containing the authentication information of the user agent for the realm of the resource being requested.""") +@cli_util.option('--resource-type-schema-version', help=u"""An endpoint-specific schema version number to use in the Request. Allowed version values are Earliest Version or Latest Version as specified in each REST API endpoint description, or any sequential number inbetween. All schema attributes/body parameters are a part of version 1. After version 1, any attributes added or deprecated will be tagged with the version that they were added to or deprecated in. If no version is provided, the latest schema version is returned.""") +@cli_util.option('--attributes', type=custom_types.CLI_COMPLEX_TYPE, help=u"""A multi-valued list of strings indicating the names of resource attributes to return in the response overriding the set of attributes that would be returned by default. Attribute names MUST be in standard attribute notation ([Section 3.10]) form. See ([additional retrieval query parameters]). OPTIONAL.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) +@cli_util.option('--attribute-sets', type=custom_types.CliCaseInsensitiveChoice(["all", "always", "never", "request", "default"]), help=u"""A multi-valued list of strings indicating the return type of attribute definition. The specified set of attributes can be fetched by the return type of the attribute. One or more values can be given together to fetch more than one group of attributes. If \"attributes\" query parameter is also available, union of the two is fetched. Valid values : all, always, never, request, default. Values are case-insensitive. OPTIONAL.""") +@cli_util.option('--filter', help=u"""The filter string that is used to request a subset of resources. The filter string MUST be a valid filter expression. See [Section 3.4.2.2]. OPTIONAL.""") +@cli_util.option('--sort-by', help=u"""A string that indicates the attribute whose value SHALL be used to order the returned responses. The sortBy attribute MUST be in standard attribute notation ([Section 3.10]) form. See [Sorting section]. OPTIONAL.""") +@cli_util.option('--sort-order', type=custom_types.CliCaseInsensitiveChoice(["ASCENDING", "DESCENDING"]), help=u"""A string that indicates the order in which the sortBy parameter is applied. Allowed values are \"ascending\" and \"descending\". See ([Sorting Section]). OPTIONAL.""") +@cli_util.option('--start-index', type=click.INT, help=u"""An integer that indicates the 1-based index of the first query result. See [Pagination Section]. OPTIONAL.""") +@cli_util.option('--count', type=click.INT, help=u"""An integer that indicates the desired maximum number of query results per page. 1000 is the largest value that you can use. See the Pagination section of the System for Cross-Domain Identity Management Protocol specification for more information. ([Section 3.4.2.4]). OPTIONAL.""") +@cli_util.option('--page', help=u"""The value of the `opc-next-page` response header from the previous 'List' call.""") +@cli_util.option('--limit', type=click.INT, help=u"""The maximum number of items to return in a paginated 'List' call.""") +@json_skeleton_utils.get_cli_json_input_option({'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'attributes': {'module': 'identity_domains', 'class': 'list[string]'}}) +@cli_util.help_option +@click.pass_context +@json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'schemas': {'module': 'identity_domains', 'class': 'list[string]'}, 'attributes': {'module': 'identity_domains', 'class': 'list[string]'}}, output_type={'module': 'identity_domains', 'class': 'OciConsoleSignOnPolicyConsents'}) +@cli_util.wrap_exceptions +def search_oci_console_sign_on_policy_consents(ctx, from_json, schemas, authorization, resource_type_schema_version, attributes, attribute_sets, filter, sort_by, sort_order, start_index, count, page, limit): + + kwargs = {} + if authorization is not None: + kwargs['authorization'] = authorization + if resource_type_schema_version is not None: + kwargs['resource_type_schema_version'] = resource_type_schema_version + if page is not None: + kwargs['page'] = page + if limit is not None: + kwargs['limit'] = limit + + _details = {} + _details['schemas'] = cli_util.parse_json_parameter("schemas", schemas) + + if attributes is not None: + _details['attributes'] = cli_util.parse_json_parameter("attributes", attributes) + + if attribute_sets is not None: + _details['attributeSets'] = cli_util.parse_json_parameter("attribute_sets", attribute_sets) + + if filter is not None: + _details['filter'] = filter + + if sort_by is not None: + _details['sortBy'] = sort_by + + if sort_order is not None: + _details['sortOrder'] = sort_order + + if start_index is not None: + _details['startIndex'] = start_index + + if count is not None: + _details['count'] = count + + client = cli_util.build_client('identity_domains', 'identity_domains', ctx) + result = client.search_oci_console_sign_on_policy_consents( + oci_console_sign_on_policy_consent_search_request=_details, + **kwargs + ) + cli_util.render_response(result, ctx) + + @password_policies_group.command(name=cli_util.override('identity_domains.search_password_policies.command_name', 'search'), help=u"""Search for password policies using POST. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](searchPasswordPolicies)""") @@ -26580,7 +26852,7 @@ def search_password_policies(ctx, from_json, schemas, authorization, resource_ty cli_util.render_response(result, ctx) -@policies_group.command(name=cli_util.override('identity_domains.search_policies.command_name', 'search'), help=u"""Search Policies Using POST +@policy_group.command(name=cli_util.override('identity_domains.search_policies.command_name', 'search'), help=u"""Search Policies Using POST The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](searchPolicies)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. Query requests MUST be identified using the following URI: \"urn:ietf:params:scim:api:messages:2.0:SearchRequest\" REQUIRED.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) @@ -26708,7 +26980,7 @@ def search_resource_type_schema_attributes(ctx, from_json, schemas, authorizatio cli_util.render_response(result, ctx) -@rules_group.command(name=cli_util.override('identity_domains.search_rules.command_name', 'search'), help=u"""Search Rules Using POST +@rule_group.command(name=cli_util.override('identity_domains.search_rules.command_name', 'search'), help=u"""Search Rules Using POST. The top level --endpoint parameter must be supplied for this operation. \n[Command Reference](searchRules)""") @cli_util.option('--schemas', required=True, type=custom_types.CLI_COMPLEX_TYPE, help=u"""The schemas attribute is an array of Strings which allows introspection of the supported schema version for a SCIM representation as well any schema extensions supported by that representation. Each String value must be a unique URI. Query requests MUST be identified using the following URI: \"urn:ietf:params:scim:api:messages:2.0:SearchRequest\" REQUIRED.""" + custom_types.cli_complex_type.COMPLEX_TYPE_HELP) diff --git a/services/identity_domains/tests/util/generated/command_to_api.py b/services/identity_domains/tests/util/generated/command_to_api.py index 4e5245a34..a8cdb6043 100644 --- a/services/identity_domains/tests/util/generated/command_to_api.py +++ b/services/identity_domains/tests/util/generated/command_to_api.py @@ -38,6 +38,7 @@ "identity_domains.create_o_auth_partner_certificate": "oci.identity_domains.IdentityDomainsClient.create_o_auth_partner_certificate", "identity_domains.create_password_policy": "oci.identity_domains.IdentityDomainsClient.create_password_policy", "identity_domains.create_policy": "oci.identity_domains.IdentityDomainsClient.create_policy", + "identity_domains.create_restore_oci_console_policy": "oci.identity_domains.IdentityDomainsClient.create_restore_oci_console_policy", "identity_domains.create_rule": "oci.identity_domains.IdentityDomainsClient.create_rule", "identity_domains.create_security_question": "oci.identity_domains.IdentityDomainsClient.create_security_question", "identity_domains.create_self_registration_profile": "oci.identity_domains.IdentityDomainsClient.create_self_registration_profile", @@ -125,6 +126,7 @@ "identity_domains.get_o_auth2_client_credential": "oci.identity_domains.IdentityDomainsClient.get_o_auth2_client_credential", "identity_domains.get_o_auth_client_certificate": "oci.identity_domains.IdentityDomainsClient.get_o_auth_client_certificate", "identity_domains.get_o_auth_partner_certificate": "oci.identity_domains.IdentityDomainsClient.get_o_auth_partner_certificate", + "identity_domains.get_oci_console_sign_on_policy_consent": "oci.identity_domains.IdentityDomainsClient.get_oci_console_sign_on_policy_consent", "identity_domains.get_password_policy": "oci.identity_domains.IdentityDomainsClient.get_password_policy", "identity_domains.get_policy": "oci.identity_domains.IdentityDomainsClient.get_policy", "identity_domains.get_rule": "oci.identity_domains.IdentityDomainsClient.get_rule", @@ -181,6 +183,7 @@ "identity_domains.list_o_auth2_client_credentials": "oci.identity_domains.IdentityDomainsClient.list_o_auth2_client_credentials", "identity_domains.list_o_auth_client_certificates": "oci.identity_domains.IdentityDomainsClient.list_o_auth_client_certificates", "identity_domains.list_o_auth_partner_certificates": "oci.identity_domains.IdentityDomainsClient.list_o_auth_partner_certificates", + "identity_domains.list_oci_console_sign_on_policy_consents": "oci.identity_domains.IdentityDomainsClient.list_oci_console_sign_on_policy_consents", "identity_domains.list_password_policies": "oci.identity_domains.IdentityDomainsClient.list_password_policies", "identity_domains.list_policies": "oci.identity_domains.IdentityDomainsClient.list_policies", "identity_domains.list_resource_type_schema_attributes": "oci.identity_domains.IdentityDomainsClient.list_resource_type_schema_attributes", @@ -295,6 +298,7 @@ "identity_domains.search_o_auth2_client_credentials": "oci.identity_domains.IdentityDomainsClient.search_o_auth2_client_credentials", "identity_domains.search_o_auth_client_certificates": "oci.identity_domains.IdentityDomainsClient.search_o_auth_client_certificates", "identity_domains.search_o_auth_partner_certificates": "oci.identity_domains.IdentityDomainsClient.search_o_auth_partner_certificates", + "identity_domains.search_oci_console_sign_on_policy_consents": "oci.identity_domains.IdentityDomainsClient.search_oci_console_sign_on_policy_consents", "identity_domains.search_password_policies": "oci.identity_domains.IdentityDomainsClient.search_password_policies", "identity_domains.search_policies": "oci.identity_domains.IdentityDomainsClient.search_policies", "identity_domains.search_resource_type_schema_attributes": "oci.identity_domains.IdentityDomainsClient.search_resource_type_schema_attributes", diff --git a/services/integration/src/oci_cli_integration_instance/integration_cli_extended.py b/services/integration/src/oci_cli_integration_instance/integration_cli_extended.py index 05a67479f..b5f034278 100644 --- a/services/integration/src/oci_cli_integration_instance/integration_cli_extended.py +++ b/services/integration/src/oci_cli_integration_instance/integration_cli_extended.py @@ -110,7 +110,7 @@ def list_work_requests_extended(ctx, **kwargs): @cli_util.copy_params_from_generated_command(integrationinstance_cli.update_integration_instance, params_to_exclude=['integration_instance_id', 'integration_instance_type']) @integrationinstance_cli.integration_instance_group.command(name=cli_util.override('integration.update_integration_instance.command_name', 'update'), help=integrationinstance_cli.update_integration_instance.help) @cli_util.option('--id', required=True, help=u"""Unique Integration Instance identifier.""") -@cli_util.option('--type', type=custom_types.CliCaseInsensitiveChoice(["STANDARD", "ENTERPRISE"]), help=u"""Standard or Enterprise type""") +@cli_util.option('--type', type=custom_types.CliCaseInsensitiveChoice(["STANDARD", "ENTERPRISE", "STANDARDX", "ENTERPRISEX", "HEALTHCARE"]), help=u"""Standard, Enterprise, Standardx, Enterprisex or Healthcare type""") @click.pass_context @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'integration', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'integration', 'class': 'dict(str, dict(str, object))'}, 'custom-endpoint': {'module': 'integration', 'class': 'UpdateCustomEndpointDetails'}, 'alternate-custom-endpoints': {'module': 'integration', 'class': 'list[UpdateCustomEndpointDetails]'}}) @cli_util.wrap_exceptions @@ -127,7 +127,7 @@ def update_integration_instance_extended(ctx, **kwargs): @cli_util.copy_params_from_generated_command(integrationinstance_cli.create_integration_instance, params_to_exclude=['integration_instance_type']) @integrationinstance_cli.integration_instance_group.command(name=cli_util.override('integration.create_integration_instance.command_name', 'create'), help=integrationinstance_cli.create_integration_instance.help) -@cli_util.option('--type', required=True, type=custom_types.CliCaseInsensitiveChoice(["STANDARD", "ENTERPRISE"]), help=u"""Standard or Enterprise type""") +@cli_util.option('--type', required=True, type=custom_types.CliCaseInsensitiveChoice(["STANDARD", "ENTERPRISE", "STANDARDX", "ENTERPRISEX", "HEALTHCARE"]), help=u"""Standard, Enterprise, Standardx, Enterprisex or Healthcare type""") @click.pass_context @json_skeleton_utils.json_skeleton_generation_handler(input_params_to_complex_types={'freeform-tags': {'module': 'integration', 'class': 'dict(str, string)'}, 'defined-tags': {'module': 'integration', 'class': 'dict(str, dict(str, object))'}, 'custom-endpoint': {'module': 'integration', 'class': 'CreateCustomEndpointDetails'}, 'alternate-custom-endpoints': {'module': 'integration', 'class': 'list[CreateCustomEndpointDetails]'}, 'network-endpoint-details': {'module': 'integration', 'class': 'NetworkEndpointDetails'}}) @cli_util.wrap_exceptions diff --git a/setup.py b/setup.py index a4eaac331..2c79df185 100644 --- a/setup.py +++ b/setup.py @@ -30,7 +30,7 @@ def open_relative(*path): readme = f.read() requires = [ - 'oci==2.137.1', + 'oci==2.138.0', 'arrow>=1.0.0', 'certifi', 'click==8.0.4', diff --git a/src/oci_cli/version.py b/src/oci_cli/version.py index 13aa79232..071231314 100644 --- a/src/oci_cli/version.py +++ b/src/oci_cli/version.py @@ -2,4 +2,4 @@ # Copyright (c) 2016, 2021, Oracle and/or its affiliates. All rights reserved. # This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license. -__version__ = '3.49.4' +__version__ = '3.50.0' diff --git a/tests/resources/json_ignore_command_list.txt b/tests/resources/json_ignore_command_list.txt index 653859946..858561fef 100644 --- a/tests/resources/json_ignore_command_list.txt +++ b/tests/resources/json_ignore_command_list.txt @@ -485,3 +485,8 @@ fleet-apps-management, fleet-apps-management-admin, compliance-policy-rule, upda fleet-apps-management, fleet-apps-management-admin, compliance-policy-rule, update-compliance-policy-rule-patch-level-selection-details fleet-apps-management, fleet-apps-management-admin, compliance-policy-rule, update-compliance-policy-rule-patch-name-selection-details fleet-apps-management, fleet-apps-management-admin, compliance-policy-rule, update-compliance-policy-rule-patch-release-date-selection-details +identity-domains, condition, search +identity-domains, oci-console-sign-on-policy-consent, search +identity-domains, policy, search +identity-domains, restore-oci-console-policy, create +identity-domains, rule, search \ No newline at end of file